diff --git a/.github/workflows/build_ubuntu-22.04.sh b/.github/workflows/build_ubuntu-22.04.sh
index 3beeccf9bbd..677c46d5f33 100755
--- a/.github/workflows/build_ubuntu-22.04.sh
+++ b/.github/workflows/build_ubuntu-22.04.sh
@@ -31,26 +31,26 @@ set -u
 export INSTALL_PREFIX=$1
 
 ./configure \
-    --prefix="$INSTALL_PREFIX/" \
     --enable-largefile \
-    --with-cxx \
-    --with-zstd \
-    --with-bzlib \
+    --prefix="$INSTALL_PREFIX/" \
     --with-blas \
+    --with-bzlib \
+    --with-cxx \
+    --with-fftw \
+    --with-freetype \
+    --with-freetype-includes="/usr/include/freetype2/" \
+    --with-geos \
     --with-lapack \
     --with-libsvm \
-    --with-readline \
+    --with-netcdf \
     --with-openmp \
     --with-pdal \
-    --with-pthread \
-    --with-tiff \
-    --with-freetype \
-    --with-freetype-includes="/usr/include/freetype2/" \
     --with-proj-share=/usr/share/proj \
-    --with-geos \
+    --with-pthread \
+    --with-readline \
     --with-sqlite \
-    --with-fftw \
-    --with-netcdf
+    --with-tiff \
+    --with-zstd
 
 eval $makecmd
 make install
diff --git a/.github/workflows/build_ubuntu-22.04_without_x.sh b/.github/workflows/build_ubuntu-22.04_without_x.sh
index 5df3a0b7e33..7e05457a4ee 100755
--- a/.github/workflows/build_ubuntu-22.04_without_x.sh
+++ b/.github/workflows/build_ubuntu-22.04_without_x.sh
@@ -30,25 +30,25 @@ set -u
 export INSTALL_PREFIX=$1
 
 ./configure \
-    --prefix="$INSTALL_PREFIX/" \
     --enable-largefile \
-    --with-cxx \
-    --with-zstd \
-    --with-bzlib \
+    --prefix="$INSTALL_PREFIX/" \
     --with-blas \
-    --with-lapack \
-    --with-readline \
-    --without-openmp \
-    --with-pdal \
-    --without-pthread \
-    --with-tiff \
+    --with-bzlib \
+    --with-cxx \
+    --with-fftw \
     --with-freetype \
     --with-freetype-includes="/usr/include/freetype2/" \
-    --with-proj-share=/usr/share/proj \
     --with-geos \
+    --with-lapack \
+    --with-netcdf \
+    --with-pdal \
+    --with-proj-share=/usr/share/proj \
+    --with-readline \
     --with-sqlite \
-    --with-fftw \
-    --with-netcdf
+    --with-tiff \
+    --with-zstd \
+    --without-openmp \
+    --without-pthread
 
 eval $makecmd
 make install
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 51ab83015ca..5253a9ee7a4 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -58,25 +58,26 @@ jobs:
           echo "CFLAGS=${{ env.CFLAGS }}" >> $GITHUB_ENV
           echo "CXXFLAGS=${{ env.CXXFLAGS }}" >> $GITHUB_ENV
           ./configure \
-              --prefix="$HOME/install/" \
               --enable-largefile \
-              --with-cxx \
-              --with-zstd \
-              --with-bzlib \
+              --prefix="$HOME/install/" \
               --with-blas \
-              --with-lapack \
-              --with-readline \
-              --without-openmp \
-              --with-pdal \
-              --without-pthread \
-              --with-tiff \
+              --with-bzlib \
+              --with-cxx \
+              --with-fftw \
               --with-freetype \
               --with-freetype-includes="/usr/include/freetype2/" \
-              --with-proj-share=/usr/share/proj \
               --with-geos \
+              --with-lapack \
+              --with-netcdf \
+              --with-pdal \
+              --with-proj-share=/usr/share/proj \
+              --with-readline \
               --with-sqlite \
-              --with-fftw \
-              --with-netcdf
+              --with-tiff \
+              --with-zstd \
+              --without-openmp \
+              --without-pthread
+
         env:
           CFLAGS: -fPIC -g
           CXXFLAGS: -fPIC -g
diff --git a/.github/workflows/macos_install.sh b/.github/workflows/macos_install.sh
index 8a94bc15c6a..31d7d23ce8d 100755
--- a/.github/workflows/macos_install.sh
+++ b/.github/workflows/macos_install.sh
@@ -12,51 +12,51 @@ INSTALL_PREFIX=$1
 
 CONFIGURE_FLAGS="\
   --prefix=${INSTALL_PREFIX} \
-  --with-opengl=aqua \
-  --with-openmp \
-  --without-x \
+  --with-blas=openblas \
+  --with-bzlib \
+  --with-bzlib-includes=${CONDA_PREFIX}/include \
+  --with-bzlib-libs=${CONDA_PREFIX}/lib \
+  --with-cairo \
+  --with-cairo-includes=${CONDA_PREFIX}/include/cairo \
+  --with-cairo-ldflags="-lcairo" \
+  --with-cairo-libs=${CONDA_PREFIX}/lib \
+  --with-cxx \
+  --with-fftw-includes=${CONDA_PREFIX}/include \
+  --with-fftw-libs=${CONDA_PREFIX}/lib \
   --with-freetype \
   --with-freetype-includes=${CONDA_PREFIX}/include/freetype2 \
   --with-freetype-libs=${CONDA_PREFIX}/lib \
   --with-gdal=${CONDA_PREFIX}/bin/gdal-config \
-  --with-proj-includes=${CONDA_PREFIX}/include \
-  --with-proj-libs=${CONDA_PREFIX}/lib \
-  --with-proj-share=${CONDA_PREFIX}/share/proj \
   --with-geos=${CONDA_PREFIX}/bin/geos-config \
+  --with-includes=${CONDA_PREFIX}/include \
+  --with-lapack=openblas \
   --with-libpng=${CONDA_PREFIX}/bin/libpng-config \
-  --with-tiff-includes=${CONDA_PREFIX}/include \
-  --with-tiff-libs=${CONDA_PREFIX}/lib \
-  --with-postgres=yes \
-  --with-postgres-includes=${CONDA_PREFIX}/include \
-  --with-postgres-libs=${CONDA_PREFIX}/lib \
-  --without-mysql \
-  --with-sqlite \
-  --with-sqlite-libs=${CONDA_PREFIX}/lib \
-  --with-sqlite-includes=${CONDA_PREFIX}/include \
-  --with-fftw-includes=${CONDA_PREFIX}/include \
-  --with-fftw-libs=${CONDA_PREFIX}/lib \
-  --with-cxx \
-  --with-cairo \
-  --with-cairo-includes=${CONDA_PREFIX}/include/cairo \
-  --with-cairo-libs=${CONDA_PREFIX}/lib \
-  --with-cairo-ldflags="-lcairo" \
-  --with-zstd \
-  --with-zstd-libs=${CONDA_PREFIX}/lib \
-  --with-zstd-includes=${CONDA_PREFIX}/include \
-  --with-bzlib \
-  --with-bzlib-libs=${CONDA_PREFIX}/lib \
-  --with-bzlib-includes=${CONDA_PREFIX}/include \
+  --with-libs=${CONDA_PREFIX}/lib \
   --with-netcdf=${CONDA_PREFIX}/bin/nc-config \
-  --with-blas=openblas \
-  --with-lapack=openblas \
   --with-netcdf=${CONDA_PREFIX}/bin/nc-config \
   --with-nls \
-  --with-libs=${CONDA_PREFIX}/lib \
-  --with-includes=${CONDA_PREFIX}/include \
+  --with-opengl=aqua \
+  --with-openmp \
   --with-pdal \
+  --with-postgres-includes=${CONDA_PREFIX}/include \
+  --with-postgres-libs=${CONDA_PREFIX}/lib \
+  --with-postgres=yes \
+  --with-proj-includes=${CONDA_PREFIX}/include \
+  --with-proj-libs=${CONDA_PREFIX}/lib \
+  --with-proj-share=${CONDA_PREFIX}/share/proj \
   --with-readline \
   --with-readline-includes=${CONDA_PREFIX}/include/readline \
   --with-readline-libs=${CONDA_PREFIX}/lib
+  --with-sqlite \
+  --with-sqlite-includes=${CONDA_PREFIX}/include \
+  --with-sqlite-libs=${CONDA_PREFIX}/lib \
+  --with-tiff-includes=${CONDA_PREFIX}/include \
+  --with-tiff-libs=${CONDA_PREFIX}/lib \
+  --with-zstd \
+  --with-zstd-includes=${CONDA_PREFIX}/include \
+  --with-zstd-libs=${CONDA_PREFIX}/lib \
+  --without-mysql \
+  --without-x \
 "
 
 export CFLAGS="-O2 -pipe -arch ${CONDA_ARCH} -DGL_SILENCE_DEPRECATION -Wall -Wextra -Wpedantic -Wvla"
diff --git a/.github/workflows/optional_requirements.txt b/.github/workflows/optional_requirements.txt
index 244a75e2933..078e9fadfb8 100644
--- a/.github/workflows/optional_requirements.txt
+++ b/.github/workflows/optional_requirements.txt
@@ -1,4 +1,4 @@
 folium
+ipyleaflet
 jupyter
 PyVirtualDisplay
-ipyleaflet
diff --git a/.gunittest.cfg b/.gunittest.cfg
index 2117fde9d7a..45ae87c12a4 100644
--- a/.gunittest.cfg
+++ b/.gunittest.cfg
@@ -12,8 +12,8 @@ exclude =
     python/grass/temporal/testsuite/unittests_temporal_raster_algebra_equal_ts.py
     python/grass/temporal/testsuite/unittests_temporal_raster_conditionals_complement_else.py
     raster/r.in.lidar/testsuite/test_base_resolution.sh
-    temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
     temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
+    temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
     temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
     temporal/t.info/testsuite/test.t.info.sh
     temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
diff --git a/.travis/linux.script.sh b/.travis/linux.script.sh
index 4944f7e894e..f2ab000dfc3 100755
--- a/.travis/linux.script.sh
+++ b/.travis/linux.script.sh
@@ -11,28 +11,28 @@ echo "MAKEFLAGS is '$MAKEFLAGS'"
 
 ./configure --host=x86_64-linux-gnu \
             --build=x86_64-linux-gnu \
+            --enable-largefile \
+            --enable-shared \
             --prefix=/usr/lib \
-            --sysconfdir=/etc \
             --sharedstatedir=/var \
-            --enable-shared \
-            --with-postgres \
+            --sysconfdir=/etc \
+            --with-blas \
+            --with-cairo \
             --with-cxx \
-            --with-gdal \
             --with-freetype \
-            --with-readline \
-            --with-nls \
-            --with-odbc \
+            --with-freetype-includes=/usr/include/freetype2/ \
+            --with-gdal \
             --with-geos \
             --with-lapack \
             --with-netcdf \
-            --with-blas \
-            --with-sqlite \
-            --with-zstd \
-            --enable-largefile \
-            --with-freetype-includes=/usr/include/freetype2/ \
+            --with-nls \
+            --with-odbc \
+            --with-pdal \
+            --with-postgres \
             --with-postgres-includes=/usr/include/postgresql/ \
             --with-proj-share=/usr/share/proj \
-            --with-cairo \
-            --with-pdal
+            --with-readline \
+            --with-sqlite \
+            --with-zstd
 
 make CFLAGS="$CFLAGS $GRASS_EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $GRASS_EXTRA_CXXFLAGS"
diff --git a/Dockerfile b/Dockerfile
index 6b928fb46c9..a3645bc558d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -131,9 +131,9 @@ ARG GRASS_CONFIG="\
   "
 
 ARG GRASS_PYTHON_PACKAGES="\
-    Pillow \
     matplotlib \
     numpy \
+    Pillow \
     pip \
     ply \
     psycopg2 \
diff --git a/Vagrantfile b/Vagrantfile
index 035bb0c64cb..99c373e82ef 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -43,11 +43,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     packageList = [
       "autoconf2.69",
       "autotools-dev",
-      "make",
+      "bison",
+      "flex",
       "g++",
       "gettext",
-      "flex",
-      "bison",
+      "libblas-dev",
       "libcairo2-dev",
       "libfftw3-dev",
       "libfreetype6-dev",
@@ -55,27 +55,27 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       "libgeos-dev",
       "libglu1-mesa-dev",
       "libjpeg-dev",
-      "libpng-dev",
-      "libtiff-dev",
+      "liblapack-dev",
       "libmysqlclient-dev",
       "libncurses5-dev",
+      "libnetcdf-dev",
+      "libpng-dev",
       "libpq-dev",
       "libproj-dev",
-      "proj-bin",
       "libreadline-dev",
       "libsqlite3-dev",
+      "libtiff-dev",
       "libxmu-dev",
+      "make",
+      "netcdf-bin",
+      "proj-bin",
       "python3",
-      "python3-wxgtk4.0",
       "python3-dateutil",
       "python3-dev",
       "python3-numpy",
-      "python3-ply",
       "python3-pil",
-      "libnetcdf-dev",
-      "netcdf-bin",
-      "libblas-dev",
-      "liblapack-dev",
+      "python3-ply",
+      "python3-wxgtk4.0",
       "unixodbc-dev",
       "zlib1g-dev",
       # "libpdal-dev"
diff --git a/binder/apt.txt b/binder/apt.txt
index 1ee0d6836f9..7f4a3500c82 100644
--- a/binder/apt.txt
+++ b/binder/apt.txt
@@ -19,7 +19,6 @@ liblapack-dev
 libncurses5-dev
 libnetcdf-dev
 libpdal-dev
-libgeos-dev
 libpng-dev
 libpq-dev
 libproj-dev
diff --git a/binder/postBuild b/binder/postBuild
index 138326daa18..fd462729ec3 100755
--- a/binder/postBuild
+++ b/binder/postBuild
@@ -5,15 +5,15 @@ set -e
 
 # compile
 ./configure \
-    --with-nls \
-    --with-cxx \
-    --with-readline \
     --with-bzlib \
-    --with-proj-share=/usr/share/proj \
-    --with-geos=/usr/bin/geos-config \
     --with-cairo \
-    --with-opengl-libs=/usr/include/GL \
+    --with-cxx \
     --with-freetype=yes --with-freetype-includes="/usr/include/freetype2/" \
+    --with-geos=/usr/bin/geos-config \
+    --with-nls \
+    --with-opengl-libs=/usr/include/GL \
+    --with-proj-share=/usr/share/proj \
+    --with-readline \
     --with-sqlite=yes \
     --without-pdal
 make
diff --git a/contributors.csv b/contributors.csv
index 5f501d9f077..c9236bb1aea 100644
--- a/contributors.csv
+++ b/contributors.csv
@@ -1,25 +1,25 @@
 cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid
--,Ivan Shmakov,<ivan siamics.net>,Russia,1gray,yes,-
--,Eric Patton,<eric.patton canada.ca>,Canada,epatton,yes,-
--,Laura Toma,<ltoma bowdoin.edu>,USA,ltoma,yes,-
--,Markus Metz,<markus.metz.giswork googlemail.com>,Germany,mmetz,yes,0000-0002-4038-8754
--,Maris Nartiss,<maris.gis gmail.com>,Latvia,marisn,yes,0000-0002-3875-740X
--,Marco Pasetti,<marco.pasetti alice.it>,Italy,marcopx,yes,-
--,Yann Chemin,<dr.yann.chemin gmail.com>,France,ychemin,yes,0000-0001-9232-5512
--,Colin Nielsen,<colin.nielsen gmail.com>,USA,cnielsen,yes,-
+-,Anna Petrášová,<kratochanna gmail.com>,Czech Republic,annakrat,yes,0000-0002-5120-5538
 -,Anne Ghisla,<a.ghisla gmail.com>,Italy,aghisla,yes,-
+-,Colin Nielsen,<colin.nielsen gmail.com>,USA,cnielsen,yes,-
+-,Eric Patton,<eric.patton canada.ca>,Canada,epatton,yes,-
 -,Helmut Kudrnovsky,<hellik web.de>,Austria,hellik,yes,0000-0001-6622-7169
--,Anna Petrášová,<kratochanna gmail.com>,Czech Republic,annakrat,yes,0000-0002-5120-5538
+-,Ivan Shmakov,<ivan siamics.net>,Russia,1gray,yes,-
+-,Laura Toma,<ltoma bowdoin.edu>,USA,ltoma,yes,-
 -,Luca Delucchi,<lucadeluge gmail.com>,Italy,lucadelu,yes,0000-0002-0493-3516
--,Václav Petráš,<wenzeslaus gmail.com>,Czech Republic,wenzeslaus,yes,0000-0001-5566-9236
--,Pietro Zambelli,<peter.zamb gmail.com>,Italy,zarch,yes,0000-0002-6187-3572
--,Štěpán Turek,<stepan.turek seznam.cz>,Czech Republic,turek,yes,-
+-,Marco Pasetti,<marco.pasetti alice.it>,Italy,marcopx,yes,-
 -,Margherita Di Leo,<diregola gmail com>,Italy,madi,yes,0000-0002-0279-7557
--,Veronica Andreo,<veroandreo gmail.com>,Argentina,veroandreo,yes,0000-0002-4633-2161
--,Stefan Blumentrath,<stefan.blumentrath nina.no>,Norway,sbl,yes,0000-0001-6675-1331
+-,Maris Nartiss,<maris.gis gmail.com>,Latvia,marisn,yes,0000-0002-3875-740X
+-,Markus Metz,<markus.metz.giswork googlemail.com>,Germany,mmetz,yes,0000-0002-4038-8754
+-,Nicklas Larsson,<n_larsson yahoo.com>,Hungary/Sweden,nilason,yes,-
 -,Ondřej Pešek,<pesej.ondrek gmail.com>,Czech Republic,pesekon2,yes,0000-0002-2363-8002
+-,Pietro Zambelli,<peter.zamb gmail.com>,Italy,zarch,yes,0000-0002-6187-3572
+-,Stefan Blumentrath,<stefan.blumentrath nina.no>,Norway,sbl,yes,0000-0001-6675-1331
+-,Štěpán Turek,<stepan.turek seznam.cz>,Czech Republic,turek,yes,-
 -,Tomáš Zigo,<tomas.zigo slovanet.sk>,Slovak Republic,tmszi,yes,-
--,Nicklas Larsson,<n_larsson yahoo.com>,Hungary/Sweden,nilason,yes,-
+-,Václav Petráš,<wenzeslaus gmail.com>,Czech Republic,wenzeslaus,yes,0000-0001-5566-9236
+-,Veronica Andreo,<veroandreo gmail.com>,Argentina,veroandreo,yes,0000-0002-4633-2161
+-,Yann Chemin,<dr.yann.chemin gmail.com>,France,ychemin,yes,0000-0001-9232-5512
 alex,Alex Shevlakov,<sixote yahoo.com>,Russia,-,-,-
 andreas,Andreas Lange,<andreas.c.lange gmx.de>,Germany,-,-,-
 benjamin,Benjamin Ducke,<benducke fastmail.fm>,Germany,benducke,yes,0000-0002-0560-4749
@@ -52,9 +52,9 @@ michel,Michel Wurtz,<mw teledetection.fr>,France,-,-,-
 mike,Mike Thomas,<miketh brisbane.paradigmgeo.com>,Australia,-,-,-
 moritz,Moritz Lennert,<mlennert club.worldonline.be>,Belgium,mlennert,yes,0000-0002-2870-4515
 msieczka,Maciej Sieczka,<msieczka sieczka.org>,Poland,msieczka,yes,-
+pallech,Serena Pallecchi,<pallecch cli.di.unipi.it>,Italy,-,-,-
 paul,Paul Kelly,<paul-grass stjohnspoint.co.uk>,UK,pkelly,yes,-
 paulo,Paulo Marcondes,<pmarc.debian gmail.com>,Brazil,pmarcondes,-,-
-pallech,Serena Pallecchi,<pallecch cli.di.unipi.it>,Italy,-,-,-
 radim,Radim Blazek,<radim.blazek gmail.com>,Czech Republic,rblazek,-,-
 roberto,Roberto Micarelli,<miro iol.it>,Italy,-,-,-
 robertoa,Roberto Antolin,<rantolin.geo gmail.com>,Spain,rantolin,yes,-
diff --git a/contributors_extra.csv b/contributors_extra.csv
index 5bcbcaaa67d..1cfa5ac4a82 100644
--- a/contributors_extra.csv
+++ b/contributors_extra.csv
@@ -1,11 +1,11 @@
 name,email,country,rfc2_agreed
 Adam Laža,<ad.laza32 gmail.com>,Czech Republic,yes
+Aldo Clerici,<aldo.clerici unipr.it >,Italy,-
 Alfonso Vitti,<alfonso.vitti ing.unitn.it>,Italy,-
-Anna Zanchetta,<ciupava gmail.com>,Italy,yes
 Andrea Aime,<andrea.aime geo-solutions.it>,Italy,-
 Angus Carr,<apcarr flash.lakeheadu.ca>,Canada,-
+Anna Zanchetta,<ciupava gmail.com>,Italy,yes
 Antonio Galea,<antonio.galea gmail.com>,Italy,-
-Aldo Clerici,<aldo.clerici unipr.it >,Italy,-
 Ari Jolma,<ari.jolma tkk.fi>,Finland,-
 Bill Hughes,<bhughes grasshoppernet.com>,USA,-
 Brook Milligan,<brook nmsu.edu>,USA,-
@@ -23,8 +23,8 @@ Eric Mitchell,<emitchell altaira.com>,-,-
 Francesco Pirotti,<francesco.pirotti unipd.it>,Italy,-
 Ivan Mincik,<ivan.mincik gmail.com>,Slovakia,-
 Jacques Bouchard,<bouchard onera.fr>,France,-
-Jarrett Keifer,<jkeifer0 gmail.com>,USA,-
 Jaro Hofierka,<jhofierka gmail.com>,Slovakia,-
+Jarrett Keifer,<jkeifer0 gmail.com>,USA,-
 Jeshua Lacock,<jeshua OpenOSX.com>,USA,-
 Lars Ahlzen,<lars ahlzen.com>,-,-
 Lorenzo Moretti,<lorenzo.moretti bologna.enea.it>,Italy,-
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index b6dbebf6666..8163b5d9b08 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -29,11 +29,11 @@ ENV GRASS_RUN_PACKAGES="\
       gdal-driver-JP2OpenJPEG \
       gdal-driver-LIBKML \
       gdal-driver-MSSQLSpatial \
+      gdal-driver-netCDF \
       gdal-driver-ODBC \
       gdal-driver-PG \
       gdal-driver-PNG \
       gdal-driver-WMS \
-      gdal-driver-netCDF \
       gdal-tools \
       geos \
       geos-dev \
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 8021ccf409e..6df50c8e14d 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -88,15 +88,15 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen
 WORKDIR /src
 RUN mkdir vdatum && \
     cd vdatum && \
-    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2012.zip && unzip -j -u usa_geoid2012.zip -d /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2009.zip && unzip -j -u usa_geoid2009.zip -d /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2003.zip && unzip -j -u usa_geoid2003.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/egm08_25/egm08_25.gtx && mv egm08_25.gtx /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx && mv egm96_15.gtx /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/usa_geoid1999.zip && unzip -j -u usa_geoid1999.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2003.zip && unzip -j -u usa_geoid2003.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2009.zip && unzip -j -u usa_geoid2009.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2012.zip && unzip -j -u usa_geoid2012.zip -d /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/vertcon/vertconc.gtx && mv vertconc.gtx /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/vertcon/vertcone.gtx && mv vertcone.gtx /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/vertcon/vertconw.gtx && mv vertconw.gtx /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx && mv egm96_15.gtx /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/egm08_25/egm08_25.gtx && mv egm08_25.gtx /usr/share/proj; \
     cd .. && \
     rm -rf vdatum
 
@@ -116,16 +116,16 @@ RUN wget -q \
       -DCMAKE_C_COMPILER=gcc \
       -DCMAKE_CXX_COMPILER=g++ \
       -DCMAKE_MAKE_PROGRAM=make \
-      -DBUILD_PLUGIN_PYTHON=ON \
+      -DBUILD_PGPOINTCLOUD_TESTS=OFF \
       -DBUILD_PLUGIN_CPD=OFF \
       -DBUILD_PLUGIN_GREYHOUND=ON \
       -DBUILD_PLUGIN_HEXBIN=ON \
-      -DHEXER_INCLUDE_DIR=/usr/include/ \
-      -DBUILD_PLUGIN_NITF=OFF \
       -DBUILD_PLUGIN_ICEBRIDGE=ON \
+      -DBUILD_PLUGIN_NITF=OFF \
       -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \
-      -DBUILD_PGPOINTCLOUD_TESTS=OFF \
+      -DBUILD_PLUGIN_PYTHON=ON \
       -DBUILD_PLUGIN_SQLITE=ON \
+      -DHEXER_INCLUDE_DIR=/usr/include/ \
       -DWITH_LASZIP=OFF \
       -DWITH_LAZPERF=ON \
       -DWITH_TESTS=ON && \
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 6b928fb46c9..a3645bc558d 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -131,9 +131,9 @@ ARG GRASS_CONFIG="\
   "
 
 ARG GRASS_PYTHON_PACKAGES="\
-    Pillow \
     matplotlib \
     numpy \
+    Pillow \
     pip \
     ply \
     psycopg2 \
diff --git a/docker/ubuntu_wxgui/Dockerfile b/docker/ubuntu_wxgui/Dockerfile
index 0d1ead788a3..80dbbb1d409 100644
--- a/docker/ubuntu_wxgui/Dockerfile
+++ b/docker/ubuntu_wxgui/Dockerfile
@@ -122,15 +122,15 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen
 WORKDIR /src
 RUN mkdir vdatum && \
     cd vdatum && \
-    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2012.zip && unzip -j -u usa_geoid2012.zip -d /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2009.zip && unzip -j -u usa_geoid2009.zip -d /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2003.zip && unzip -j -u usa_geoid2003.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/egm08_25/egm08_25.gtx && mv egm08_25.gtx /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx && mv egm96_15.gtx /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/usa_geoid1999.zip && unzip -j -u usa_geoid1999.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2003.zip && unzip -j -u usa_geoid2003.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2009.zip && unzip -j -u usa_geoid2009.zip -d /usr/share/proj; \
+    wget -q http://download.osgeo.org/proj/vdatum/usa_geoid2012.zip && unzip -j -u usa_geoid2012.zip -d /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/vertcon/vertconc.gtx && mv vertconc.gtx /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/vertcon/vertcone.gtx && mv vertcone.gtx /usr/share/proj; \
     wget -q http://download.osgeo.org/proj/vdatum/vertcon/vertconw.gtx && mv vertconw.gtx /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx && mv egm96_15.gtx /usr/share/proj; \
-    wget -q http://download.osgeo.org/proj/vdatum/egm08_25/egm08_25.gtx && mv egm08_25.gtx /usr/share/proj; \
     cd .. && \
     rm -rf vdatum
 
@@ -150,16 +150,16 @@ RUN wget -q \
       -DCMAKE_C_COMPILER=gcc \
       -DCMAKE_CXX_COMPILER=g++ \
       -DCMAKE_MAKE_PROGRAM=make \
-      -DBUILD_PLUGIN_PYTHON=ON \
+      -DBUILD_PGPOINTCLOUD_TESTS=OFF \
       -DBUILD_PLUGIN_CPD=OFF \
       -DBUILD_PLUGIN_GREYHOUND=ON \
       -DBUILD_PLUGIN_HEXBIN=ON \
-      -DHEXER_INCLUDE_DIR=/usr/include/ \
-      -DBUILD_PLUGIN_NITF=OFF \
       -DBUILD_PLUGIN_ICEBRIDGE=ON \
+      -DBUILD_PLUGIN_NITF=OFF \
       -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \
-      -DBUILD_PGPOINTCLOUD_TESTS=OFF \
+      -DBUILD_PLUGIN_PYTHON=ON \
       -DBUILD_PLUGIN_SQLITE=ON \
+      -DHEXER_INCLUDE_DIR=/usr/include/ \
       -DWITH_LASZIP=OFF \
       -DWITH_LAZPERF=ON \
       -DWITH_TESTS=ON && \
@@ -186,8 +186,8 @@ ENV CXXFLAGS "$MYCXXFLAGS"
 
 # Configure compile and install GRASS GIS
 # wxGUI require
-# --with-x
 # --with-nls
+# --with-x
 ENV NUMTHREADS=4
 RUN make distclean || echo "nothing to clean"
 RUN /src/grass_build/configure \
diff --git a/macosx/ReadMe.md b/macosx/ReadMe.md
index 86fb1c0ba38..085c09c691b 100644
--- a/macosx/ReadMe.md
+++ b/macosx/ReadMe.md
@@ -172,6 +172,11 @@ just remove the `--prefix` and `--enable-macosx-app` flags)*:
 
 ```bash
 ./configure \
+    --enable-macosx-app \
+    --prefix=/Applications \
+    --with-cxx \
+    --with-fftw-includes=/Library/Frameworks/FFTW3.framework/unix/include \
+    --with-fftw-libs=/Library/Frameworks/FFTW3.framework/unix/lib \
     --with-freetype \
     --with-freetype-includes= \
         "/Library/Frameworks/FreeType.framework/unix/include/freetype2 \
@@ -179,36 +184,31 @@ just remove the `--prefix` and `--enable-macosx-app` flags)*:
     --with-freetype-libs=/Library/Frameworks/FreeType.framework/unix/lib \
     --with-gdal=/Library/Frameworks/GDAL.framework/Programs/gdal-config \
     --with-geos=/Library/Frameworks/GEOS.framework/Programs/geos-config \
-    --with-proj \
-    --with-proj-includes=/Library/Frameworks/PROJ.framework/unix/include \
-    --with-proj-libs=/Library/Frameworks/PROJ.framework/unix/lib \
-    --with-proj-share=/Library/Frameworks/PROJ.framework/Resources/proj \
     --with-jpeg-includes=/Library/Frameworks/UnixImageIO.framework/unix/include \
     --with-jpeg-libs=/Library/Frameworks/UnixImageIO.framework/unix/lib \
+    --with-odbc \
+    --with-opengl=aqua \
     --with-png-includes=/Library/Frameworks/UnixImageIO.framework/unix/include \
     --with-png-libs=/Library/Frameworks/UnixImageIO.framework/unix/lib \
-    --with-tiff-includes=/Library/Frameworks/UnixImageIO.framework/unix/include \
-    --with-tiff-libs=/Library/Frameworks/UnixImageIO.framework/unix/lib \
-    --without-postgres \
-    --without-mysql \
-    --with-odbc \
+    --with-proj \
+    --with-proj-includes=/Library/Frameworks/PROJ.framework/unix/include \
+    --with-proj-libs=/Library/Frameworks/PROJ.framework/unix/lib \
+    --with-proj-share=/Library/Frameworks/PROJ.framework/Resources/proj \
     --with-sqlite \
-    --with-sqlite-libs=/Library/Frameworks/SQLite3.framework/unix/lib \
     --with-sqlite-includes=/Library/Frameworks/SQLite3.framework/unix/include \
-    --with-fftw-includes=/Library/Frameworks/FFTW3.framework/unix/include \
-    --with-fftw-libs=/Library/Frameworks/FFTW3.framework/unix/lib \
-    --with-cxx \
+    --with-sqlite-libs=/Library/Frameworks/SQLite3.framework/unix/lib \
     --with-tcltk-includes="/Library/Frameworks/Tcl.framework/Headers \
             /Library/Frameworks/Tk.framework/Headers \
             /Library/Frameworks/Tk.framework/PrivateHeaders" \
     --with-tcltk-libs=/usr/local/lib \
+    --with-tiff-includes=/Library/Frameworks/UnixImageIO.framework/unix/include \
+    --with-tiff-libs=/Library/Frameworks/UnixImageIO.framework/unix/lib \
     --with-x \
-    --without-motif \
     --without-glw \
-    --with-opengl=aqua \
-    --without-readline \
-    --prefix=/Applications \
-    --enable-macosx-app
+    --without-motif \
+    --without-mysql \
+    --without-postgres \
+    --without-readline
 ```
 
 That's a long line, but you have to be very explicit in the GRASS configure
@@ -533,10 +533,21 @@ For i386:
 
 ```sh
 cd build-i386
-../configure --enable-shared --disable-static --disable-debug \
-    --disable-ffserver --disable-network --enable-gpl --enable-pthreads \
-    --enable-swscale --disable-vhook --disable-ffplay --disable-ffmpeg \
-    --disable-amd3dnow --arch=i386 --extra-cflags="-arch i386" \
+../configure \
+    --arch=i386 \
+    --disable-amd3dnow \
+    --disable-debug \
+    --disable-ffmpeg \
+    --disable-ffplay \
+    --disable-ffserver \
+    --disable-network \
+    --disable-static \
+    --disable-vhook \
+    --enable-gpl \
+    --enable-pthreads \
+    --enable-shared \
+    --enable-swscale \
+    --extra-cflags="-arch i386" \
     --extra-ldflags="-arch i386"
 ```
 
@@ -555,10 +566,21 @@ Now, the PPC build:
 
 ```sh
 cd ../build-ppc
-../configure --enable-shared --disable-static --disable-debug \
-    --disable-ffserver --disable-network --enable-gpl --enable-pthreads \
-    --enable-swscale --disable-vhook --disable-ffplay --disable-ffmpeg \
-    --enable-altivec --arch=ppc --extra-cflags="-arch ppc" \
+../configure \
+    --arch=ppc \
+    --disable-debug \
+    --disable-ffmpeg \
+    --disable-ffplay \
+    --disable-ffserver \
+    --disable-network \
+    --disable-static \
+    --disable-vhook \
+    --enable-altivec \
+    --enable-gpl \
+    --enable-pthreads \
+    --enable-shared \
+    --enable-swscale \
+    --extra-cflags="-arch ppc" \
     --extra-ldflags="-arch ppc"
 make
 ```
@@ -572,10 +594,21 @@ For x86_64:
 
 ```sh
 cd build-x86_64
-../configure --enable-shared --disable-static --disable-debug \
-    --disable-ffserver --disable-network --enable-gpl --enable-pthreads \
-    --enable-swscale --disable-vhook --disable-ffplay --disable-ffmpeg \
-    --disable-amd3dnow --arch=x86_64 --extra-cflags="-arch x86\_64" \
+../configure \
+    --arch=x86_64 \
+    --disable-amd3dnow \
+    --disable-debug \
+    --disable-ffmpeg \
+    --disable-ffplay \
+    --disable-ffserver \
+    --disable-network \
+    --disable-static \
+    --disable-vhook \
+    --enable-gpl \
+    --enable-pthreads \
+    --enable-shared \
+    --enable-swscale \
+    --extra-cflags="-arch x86\_64" \
     --extra-ldflags="-arch x86_64"
 ```
 
@@ -588,10 +621,21 @@ And ppc64:
 
 ```sh
 cd ../build-ppc64
-../configure --enable-shared --disable-static --disable-debug \
-    --disable-ffserver --disable-network --enable-gpl --enable-pthreads \
-    --enable-swscale --disable-vhook --disable-ffplay --disable-ffmpeg \
-    --enable-altivec --arch=ppc64 --extra-cflags="-arch ppc64" \
+../configure \
+    --arch=ppc64 \
+    --disable-debug \
+    --disable-ffmpeg \
+    --disable-ffplay \
+    --disable-ffserver \
+    --disable-network \
+    --disable-static \
+    --disable-vhook \
+    --enable-altivec \
+    --enable-gpl \
+    --enable-pthreads \
+    --enable-shared \
+    --enable-swscale \
+    --extra-cflags="-arch ppc64" \
     --extra-ldflags="-arch ppc64"
 ```
 
diff --git a/mswindows/crosscompile.sh b/mswindows/crosscompile.sh
index d1b834df008..ec43dcab689 100755
--- a/mswindows/crosscompile.sh
+++ b/mswindows/crosscompile.sh
@@ -129,17 +129,17 @@ CFLAGS="-g -O2 -Wall" \
 CXXFLAGS="-g -O2 -Wall" \
 LDFLAGS="-lcurses" \
 ./configure \
---with-nls \
---with-readline \
---with-freetype-includes=$freetype_include \
---with-bzlib \
---with-postgres \
---with-pthread \
---with-openmp \
 --with-blas \
---with-lapack \
+--with-bzlib \
+--with-freetype-includes=$freetype_include \
 --with-geos \
+--with-lapack \
 --with-netcdf \
+--with-nls \
+--with-openmp \
+--with-postgres \
+--with-pthread \
+--with-readline \
 >> /dev/stdout
 
 make clean default
@@ -159,10 +159,10 @@ fi
 build_arch=`sed -n '/^ARCH[ \t]*=/{s/^.*=[ \t]*//; p}' include/Make/Platform.make`
 for i in \
 	config.log \
-	include/Make/Platform.make \
+	error.log \
 	include/Make/Doxyfile_arch_html \
 	include/Make/Doxyfile_arch_latex \
-	error.log \
+	include/Make/Platform.make \
 ; do
 	cp -a $i $i.$build_arch
 done
@@ -186,19 +186,19 @@ PKG_CONFIG=$mxe_bin-pkg-config \
 ./configure \
 --build=$build_arch \
 --host=$arch \
---with-nls \
---with-readline \
---with-freetype-includes=$mxe_shared/include/freetype2 \
---with-bzlib \
---with-postgres \
---with-pthread \
---with-openmp \
 --with-blas \
---with-lapack \
+--with-bzlib \
+--with-freetype-includes=$mxe_shared/include/freetype2 \
+--with-gdal=$mxe_shared/bin/gdal-config \
 --with-geos=$mxe_shared/bin/geos-config \
+--with-lapack \
 --with-netcdf=$mxe_shared/bin/nc-config \
---with-gdal=$mxe_shared/bin/gdal-config \
+--with-nls \
 --with-opengl=windows \
+--with-openmp \
+--with-postgres \
+--with-pthread \
+--with-readline \
 >> /dev/stdout
 
 make clean default
@@ -217,10 +217,10 @@ fi
 arch=`sed -n '/^ARCH[ \t]*=/{s/^.*=[ \t]*//; p}' include/Make/Platform.make`
 for i in \
 	config.log \
-	include/Make/Platform.make \
+	error.log \
 	include/Make/Doxyfile_arch_html \
 	include/Make/Doxyfile_arch_latex \
-	error.log \
+	include/Make/Platform.make \
 ; do
 	cp -a $i $i.$arch
 done
@@ -307,8 +307,8 @@ for i in \
 done
 
 for i in \
-	proj \
 	gdal \
+	proj \
 ; do
 	rm -rf $dist/share/$i
 	cp -a $mxe_shared/share/$i $dist/share/$i
diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh
index d38354d4b78..98ed16aac1e 100755
--- a/mswindows/osgeo4w/build_osgeo4w.sh
+++ b/mswindows/osgeo4w/build_osgeo4w.sh
@@ -22,49 +22,48 @@ export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python312
 export ARCH=x86_64-w64-mingw32
 
 ./configure \
+    --bindir=${OSGEO4W_ROOT_MSYS}/bin \
+    --enable-largefile \
+    --enable-shared \
     --host=${ARCH} \
-    --with-libs="${OSGEO4W_ROOT_MSYS}/lib ${OSGEO4W_ROOT_MSYS}/bin" \
-    --with-includes=${OSGEO4W_ROOT_MSYS}/include \
+    --includedir=${OSGEO4W_ROOT_MSYS}/include \
     --libexecdir=${OSGEO4W_ROOT_MSYS}/bin \
     --prefix=${OSGEO4W_ROOT_MSYS}/apps/grass \
-    --bindir=${OSGEO4W_ROOT_MSYS}/bin \
-    --includedir=${OSGEO4W_ROOT_MSYS}/include \
-    --without-x \
+    --with-blas \
+    --with-bzlib \
+    --with-cairo \
+    --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include \
+    --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo" \
+    --with-cairo-libs=$OSGEO4W_ROOT_MSYS/lib \
     --with-cxx \
-    --enable-shared \
-    --enable-largefile \
-    --with-openmp \
     --with-fftw \
-    --with-nls \
-    --with-readline \
-    --with-blas \
-    --with-lapack \
     --with-freetype \
     --with-freetype-includes=${OSGEO4W_ROOT_MSYS}/include/freetype2 \
-    --with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \
-    --with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \
-    --with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \
+    --with-gdal=${SRC}/mswindows/osgeo4w/gdal-config \
+    --with-geos=${SRC}/mswindows/osgeo4w/geos-config \
+    --with-includes=${OSGEO4W_ROOT_MSYS}/include \
+    --with-lapack \
+    --with-liblas=${SRC}/mswindows/osgeo4w/liblas-config \
+    --with-libs="${OSGEO4W_ROOT_MSYS}/lib ${OSGEO4W_ROOT_MSYS}/bin" \
+    --with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config \
+    --with-nls \
+    --with-odbc \
+    --with-opengl=windows \
+    --with-openmp \
     --with-postgres \
     --with-postgres-includes=${OSGEO4W_ROOT_MSYS}/include \
     --with-postgres-libs=${OSGEO4W_ROOT_MSYS}/lib \
-    --with-gdal=${SRC}/mswindows/osgeo4w/gdal-config \
-    --with-geos=${SRC}/mswindows/osgeo4w/geos-config \
+    --with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \
+    --with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \
+    --with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \
+    --with-readline \
+    --with-regex \
     --with-sqlite \
     --with-sqlite-includes=${OSGEO4W_ROOT_MSYS}/include \
     --with-sqlite-libs=${OSGEO4W_ROOT_MSYS}/lib \
-    --with-regex \
-    --with-nls \
     --with-zstd \
-    --with-odbc \
-    --with-cairo \
-    --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include \
-    --with-cairo-libs=$OSGEO4W_ROOT_MSYS/lib \
-    --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo" \
-    --with-opengl=windows \
-    --with-bzlib \
-    --with-liblas=${SRC}/mswindows/osgeo4w/liblas-config \
-    --with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config \
-    --without-pdal
+    --without-pdal \
+    --without-x
 
 make
 
diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index b3113292c99..c189cf92c93 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -107,32 +107,32 @@ fi
 exec 3>&1 > >(tee mswindows/osgeo4w/package.log) 2>&1
 
 DLLS="
-	/mingw64/bin/zlib1.dll
-	/mingw64/bin/libbz2-1.dll
-	/mingw64/bin/libiconv-2.dll
-	/mingw64/bin/libfontconfig-1.dll
-	/mingw64/bin/libgfortran-5.dll
-	/mingw64/bin/libbrotlidec.dll
+	/mingw64/bin/libblas.dll
 	/mingw64/bin/libbrotlicommon.dll
-	/mingw64/bin/libintl-8.dll
-	/mingw64/bin/libsystre-0.dll
-	/mingw64/bin/libtre-5.dll
-	/mingw64/bin/libwinpthread-1.dll
+	/mingw64/bin/libbrotlidec.dll
+	/mingw64/bin/libbz2-1.dll
 	/mingw64/bin/libcairo-2.dll
-	/mingw64/bin/libpixman-1-0.dll
-	/mingw64/bin/libpng16-16.dll
+	/mingw64/bin/libfftw3-3.dll
+	/mingw64/bin/libfontconfig-1.dll
 	/mingw64/bin/libfreetype-6.dll
-	/mingw64/bin/libharfbuzz-0.dll
+	/mingw64/bin/libgcc_s_seh-1.dll
+	/mingw64/bin/libgfortran-5.dll
 	/mingw64/bin/libglib-2.0-0.dll
 	/mingw64/bin/libgomp-1.dll
 	/mingw64/bin/libgraphite2.dll
-	/mingw64/bin/libpcre-1.dll
-	/mingw64/bin/libstdc++-6.dll
-	/mingw64/bin/libgcc_s_seh-1.dll
-	/mingw64/bin/libfftw3-3.dll
-	/mingw64/bin/libblas.dll
+	/mingw64/bin/libharfbuzz-0.dll
+	/mingw64/bin/libiconv-2.dll
+	/mingw64/bin/libintl-8.dll
 	/mingw64/bin/liblapack.dll
+	/mingw64/bin/libpcre-1.dll
+	/mingw64/bin/libpixman-1-0.dll
+	/mingw64/bin/libpng16-16.dll
 	/mingw64/bin/libquadmath-0.dll
+	/mingw64/bin/libstdc++-6.dll
+	/mingw64/bin/libsystre-0.dll
+	/mingw64/bin/libtre-5.dll
+	/mingw64/bin/libwinpthread-1.dll
+	/mingw64/bin/zlib1.dll
 "
 
 if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
@@ -153,47 +153,47 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 
 	log configure
 	./configure \
+		--bindir=$OSGEO4W_ROOT_MSYS/bin \
+		--enable-largefile \
+		--enable-shared \
 		--host=x86_64-w64-mingw32 \
-		--with-libs="$OSGEO4W_ROOT_MSYS/lib" \
-		--with-includes=$OSGEO4W_ROOT_MSYS/include \
+		--includedir=$OSGEO4W_ROOT_MSYS/include \
 		--libexecdir=$OSGEO4W_ROOT_MSYS/bin \
 		--prefix=$OSGEO4W_ROOT_MSYS/apps/grass \
-		--bindir=$OSGEO4W_ROOT_MSYS/bin \
-		--includedir=$OSGEO4W_ROOT_MSYS/include \
-		--with-opengl=windows \
-		--without-x \
+		--with-blas \
+		--with-bzlib \
+		--with-cairo \
+		--with-cairo-includes=$OSGEO4W_ROOT_MSYS/include \
+		--with-cairo-ldflags="-L$PWD/mswindows/osgeo4w/lib -lcairo -lfontconfig" \
 		--with-cxx \
-		--enable-shared \
-		--enable-largefile \
 		--with-fftw \
 		--with-freetype \
 		--with-freetype-includes=/mingw64/include/freetype2 \
-		--with-proj-share=$OSGEO4W_ROOT_MSYS/share/proj \
-		--with-proj-includes=$OSGEO4W_ROOT_MSYS/include \
-		--with-proj-libs=$OSGEO4W_ROOT_MSYS/lib \
+		--with-gdal=$PWD/mswindows/osgeo4w/gdal-config \
+		--with-geos=$PWD/mswindows/osgeo4w/geos-config \
+		--with-includes=$OSGEO4W_ROOT_MSYS/include \
+		--with-lapack \
+		--with-lapack-includes=/mingw64/include \
+		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config \
+		--with-libs="$OSGEO4W_ROOT_MSYS/lib" \
+		--with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config \
+		--with-nls \
+		--with-odbc \
+		--with-opengl=windows \
+		--with-openmp \
 		--with-postgres \
 		--with-postgres-includes=$OSGEO4W_ROOT_MSYS/include \
 		--with-postgres-libs=$PWD/mswindows/osgeo4w/lib \
-		--with-gdal=$PWD/mswindows/osgeo4w/gdal-config \
-		--with-geos=$PWD/mswindows/osgeo4w/geos-config \
+		--with-proj-includes=$OSGEO4W_ROOT_MSYS/include \
+		--with-proj-libs=$OSGEO4W_ROOT_MSYS/lib \
+		--with-proj-share=$OSGEO4W_ROOT_MSYS/share/proj \
+		--with-regex \
 		--with-sqlite \
 		--with-sqlite-includes=$OSGEO4W_ROOT_MSYS/include \
 		--with-sqlite-libs=$PWD/mswindows/osgeo4w/lib \
-		--with-regex \
-		--with-nls \
 		--with-zstd \
-		--with-odbc \
-		--with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config \
-		--with-blas \
-		--with-lapack \
-		--with-lapack-includes=/mingw64/include \
-		--with-openmp \
-		--with-cairo \
-		--with-cairo-includes=$OSGEO4W_ROOT_MSYS/include \
-		--with-cairo-ldflags="-L$PWD/mswindows/osgeo4w/lib -lcairo -lfontconfig" \
-		--with-bzlib \
-		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config \
-		--without-pdal
+		--without-pdal \
+		--without-x
 
 	touch mswindows/osgeo4w/configure-stamp
 fi
diff --git a/package.nix b/package.nix
index 3f1d03697c7..edf1e3e18a4 100644
--- a/package.nix
+++ b/package.nix
@@ -100,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-cxx"
     "--with-fftw"
     "--with-freetype"
-    "--with-geos"
     "--with-gdal"
+    "--with-geos"
     "--with-lapack"
     "--with-libsvm"
     "--with-nls"
diff --git a/rpm/grass.spec b/rpm/grass.spec
index 90c79bc939f..3e4675db621 100644
--- a/rpm/grass.spec
+++ b/rpm/grass.spec
@@ -1,8 +1,8 @@
-%global shortver 83
+%global shortver 84
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:		grass
-Version:	8.3.0
+Version:	8.4.0
 Release:	3%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
@@ -37,64 +37,66 @@ BuildRequires:	flexiblas-devel
 %else
 BuildRequires:	blas-devel, lapack-devel
 %endif
+BuildRequires:	bzip2-devel
 BuildRequires:	cairo-devel
-BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
 BuildRequires:	fftw-devel
 BuildRequires:	flex
 BuildRequires:	freetype-devel
+BuildRequires:	gcc-c++
 BuildRequires:	gdal-devel
 BuildRequires:	geos-devel
 BuildRequires:	gettext
 BuildRequires:	laszip-devel
 BuildRequires:	libappstream-glib
 BuildRequires:	libpng-devel
+%if 0%{?rhel} && 0%{?rhel} == 7
+BuildRequires:	postgresql-devel
+%else
+BuildRequires:	libpq-devel
+%endif
 BuildRequires:	libtiff-devel
 BuildRequires:	libXmu-devel
-BuildRequires:	mesa-libGL-devel
-BuildRequires:	mesa-libGLU-devel
+BuildRequires:	libzstd-devel
+BuildRequires:	make
 %if (0%{?rhel} > 7 || 0%{?fedora})
 BuildRequires:	mariadb-connector-c-devel openssl-devel
 %else
 BuildRequires:	mysql-devel
 %endif
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	mesa-libGLU-devel
 BuildRequires:	netcdf-devel
+BuildRequires:	PDAL
+BuildRequires:	PDAL-devel
+BuildRequires:	PDAL-libs
+BuildRequires:	proj-devel
 BuildRequires:	python3
 %if 0%{?rhel} == 7
 # EPEL7
-BuildRequires:	python%{python3_version_nodots}-numpy
-%else
-BuildRequires:	python3-numpy
-%endif
-%if 0%{?rhel} && 0%{?rhel} == 7
-BuildRequires:	postgresql-devel
+BuildRequires:	python%{python3_version_nodots}-dateutil
 %else
-BuildRequires:	libpq-devel
+BuildRequires:	python3-dateutil
 %endif
-BuildRequires:	proj-devel
+BuildRequires:	python3-devel
 %if 0%{?rhel} == 7
 # EPEL7
-BuildRequires:	python%{python3_version_nodots}-dateutil
+BuildRequires:	python%{python3_version_nodots}-numpy
 %else
-BuildRequires:	python3-dateutil
+BuildRequires:	python3-numpy
 %endif
-BuildRequires:	python3-devel
 BuildRequires:	python3-pillow
-BuildRequires:	PDAL
-BuildRequires:	PDAL-libs
-BuildRequires:	PDAL-devel
 BuildRequires:	readline-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	subversion
 BuildRequires:	unixODBC-devel
 BuildRequires:	zlib-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	libzstd-devel
-BuildRequires: make
 
 Requires:	bzip2-libs
-Requires:	libzstd
 Requires:	geos
+Requires:	libzstd
+Requires:	PDAL
+Requires:	PDAL-libs
 # fedora >= 34: Nothing
 %if (0%{?rhel} > 7 || 0%{?fedora} < 34)
 Requires:	proj-datumgrid
@@ -103,26 +105,23 @@ Requires:	proj-datumgrid-world
 Requires:	python3
 %if 0%{?rhel} == 7
 # EPEL7
-Requires:	python%{python3_version_nodots}-numpy
+Requires:	python%{python3_version_nodots}-dateutil
 %else
-Requires:	python3-numpy
+Requires:	python3-dateutil
 %endif
 %if 0%{?rhel} == 7
 # EPEL7
-Requires:	python%{python3_version_nodots}-dateutil
+Requires:	python%{python3_version_nodots}-numpy
 %else
-Requires:	python3-dateutil
+Requires:	python3-numpy
 %endif
 Requires:	python3-wxpython4
-Requires:	PDAL
-Requires:	PDAL-libs
 
 %if "%{_lib}" == "lib"
 %global cpuarch 32
 %else
 %global cpuarch 64
 %endif
-
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -170,47 +169,50 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
 %build
 %configure \
 	--prefix=%{_libdir} \
-	--with-cxx \
-	--with-tiff \
-	--with-png \
-	--with-postgres \
-%if 0%{?rhel} > 7
-	--with-mysql=no \
-%else
-	--with-mysql \
-%endif
-	--with-opengl \
-	--with-odbc \
-	--with-fftw \
 	--with-blas \
-	--with-lapack \
 %if %{with flexiblas}
 	--with-blas-includes=%{_includedir}/flexiblas \
-	--with-lapack-includes=%{_includedir}/flexiblas \
 %endif
+	--with-bzlib \
 	--with-cairo \
+	--with-cairo-ldflags=-lfontconfig \
+	--with-cxx \
+	--with-fftw \
 	--with-freetype \
-	--with-nls \
-	--with-pdal \
-	--with-readline \
-	--with-regex \
-	--with-openmp \
+	--with-freetype-includes=%{_includedir}/freetype2 \
 	--with-gdal=%{_bindir}/gdal-config \
-	--with-wxwidgets=%{_bindir}/wx-config \
 	--with-geos=%{_bindir}/geos-config \
-	--with-netcdf=%{_bindir}/nc-config \
+	--with-lapack \
+%if %{with flexiblas}
+	--with-lapack-includes=%{_includedir}/flexiblas \
+%endif
+%if 0%{?rhel} > 7
+	--with-mysql=no \
+%else
+	--with-mysql \
+%endif
 	--with-mysql-includes=%{_includedir}/mysql \
 %if (0%{?fedora} >= 27)
 	--with-mysql-libs=%{_libdir} \
 %else
 	--with-mysql-libs=%{_libdir}/mysql \
 %endif
+	--with-netcdf=%{_bindir}/nc-config \
+	--with-nls \
+	--with-odbc \
+	--with-opengl \
+	--with-openmp \
+	--with-pdal \
+	--with-png \
+	--with-postgres \
 	--with-postgres-includes=%{_includedir}/pgsql \
-	--with-cairo-ldflags=-lfontconfig \
-	--with-freetype-includes=%{_includedir}/freetype2 \
-	--with-bzlib \
-	--with-zstd \
-	--with-proj-share=%{_datadir}/proj
+	--with-proj-share=%{_datadir}/proj \
+	--with-readline \
+	--with-regex \
+	--with-tiff \
+	--with-wxwidgets=%{_bindir}/wx-config \
+	--with-zstd
+
 
 # .package_note hack for RHBZ #2084342 and RHBZ #2102895
 sed -i "s+ -Wl,-dT,${RPM_BUILD_DIR}/grass-%{version}/.package_note-grass-%{version}-%{release}.%{_arch}.ld++g" include/Make/Platform.make
@@ -338,6 +340,48 @@ fi
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Sat Oct 26 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-3
+- Sort requirements and flags (https://github.com/OSGeo/grass/pull/4563/ by Edouard Choinière)
+
+* Fri Sep 06 2024 Sandro Mani <manisandro@gmail.com> - 8.4.0-2
+- Rebuild (PDAL)
+
+* Sun Jul 28 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-1
+- Update to 8.4.0
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue May 14 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-3
+- Rebuild (gdal)
+
+* Tue Mar 19 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-2
+- Rebuild (PDAL)
+
+* Thu Mar 07 2024 Markus Neteler <neteler@mundialis.de> - 8.3.2-1
+- Update to 8.3.2 (#2268514)
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan  3 2024 Florian Weimer <fweimer@redhat.com> - 8.3.1-4
+- Fix C compatibility issue in MySQL port handling
+
+* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 8.3.1-3
+- Rebuild (gdal)
+
+* Sat Oct 28 2023 Markus Neteler <neteler@mundialis.de> 8.3.1-2
+- fix obsolete configure parameters
+
+* Thu Oct 26 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.3.1-1
+- Update to GRASS GIS 8.3.1 (#2246359)
+
+* Sat Oct 14 2023 Sandro Mani <manisandro@gmail.com> - 8.3.0-4
+- Rebuild (PDAL)
+
 * Sun Aug 06 2023 Alexandre Detiste <alexandre.detiste@gmail.com> - 8.3.0-3
 - Remove support for RHEL6: Grass is now Python3 only
 
diff --git a/singularity/debian/singularityfile_debian b/singularity/debian/singularityfile_debian
index 267d7a74ad5..5858bec6911 100644
--- a/singularity/debian/singularityfile_debian
+++ b/singularity/debian/singularityfile_debian
@@ -17,8 +17,8 @@ Singularity container for GRASS GIS to be run into GRASS main directory
     # Install useful libraries
     apt-get -y update
     apt-get -y install \
-        build-essential \
         bison \
+        build-essential \
         bzip2 \
         cmake \
         curl \
@@ -40,10 +40,10 @@ Singularity container for GRASS GIS to be run into GRASS main directory
         libgsl-dev \
         libjpeg-dev \
         libjsoncpp-dev \
+        libncurses5-dev \
+        libnetcdf-dev \
         libopenblas-base \
         libopenblas-dev \
-        libnetcdf-dev \
-        libncurses5-dev \
         libopenjp2-7 \
         libopenjp2-7-dev \
         libpdal-dev \
@@ -94,29 +94,29 @@ Singularity container for GRASS GIS to be run into GRASS main directory
     GRASS_PYTHON=/usr/bin/python3
     ./configure \
         --enable-largefile \
-        --with-cxx \
-        --with-nls \
-        --with-readline \
-        --with-sqlite \
         --with-bzlib \
-        --with-zstd \
         --with-cairo \
         --with-cairo-ldflags=-lfontconfig \
+        --with-cxx \
+        --with-fftw \
         --with-freetype \
         --with-freetype-includes="/usr/include/freetype2/" \
-        --with-fftw \
+        --with-geos=/usr/bin/geos-config \
         --with-netcdf \
+        --with-nls \
         --with-pdal \
-        --with-proj \
-        --with-proj-share=/usr/share/proj \
-        --with-geos=/usr/bin/geos-config \
         --with-postgres \
         --with-postgres-includes="/usr/include/postgresql" \
+        --with-proj \
+        --with-proj-share=/usr/share/proj \
+        --with-readline \
+        --with-sqlite \
+        --with-zstd \
+        --without-ffmpeg \
         --without-mysql \
         --without-odbc \
-        --without-openmp \
-        --without-ffmpeg \
-        --without-opengl
+        --without-opengl \
+        --without-openmp
 	make -j 2 && make install && ldconfig
     # Create generic GRASS GIS binary name regardless of version number
     ln -sf `find /usr/local/bin -name "grass??" | sort | tail -n 1` /usr/local/bin/grass
diff --git a/utils/svn_name_git_author.csv b/utils/svn_name_git_author.csv
index 4811a539a82..ba1ac70d21d 100644
--- a/utils/svn_name_git_author.csv
+++ b/utils/svn_name_git_author.csv
@@ -130,7 +130,6 @@ paul,Paul Kelly <paul-grass stjohnspoint.co.uk>
 pcav,Paolo Cavallini <cavallini faunalia.it>
 pesekon2,Ondřej Pešek <pesej.ondrek gmail.com>
 pierreroudier,Pierre Roudier <pierre.roudier gmail.com>
-rodrigopitanga,Rodrigo Rodrigues Da Silva <pitanga members.fsf.org>
 pkelly,Paul Kelly <paul-grass stjohnspoint.co.uk>
 pmarcondes,Paulo Marcondes <pmarc.debian gmail.com
 prea,Damiano Preatoni <prea uninsubria.it>
@@ -146,6 +145,7 @@ robertomarzocchi,Roberto Marzocchi <roberto.marzocchi gmail.com>
 roberto,Roberto Flor <flor fbk.eu>
 roberto,Roberto Micarelli <miro iol.it>
 Robifag,Roberta Fagandini <robifagandini gmail.com>
+rodrigopitanga,Rodrigo Rodrigues Da Silva <pitanga members.fsf.org>
 roger,Roger S. Miller <rgrmill rt66.com>
 rorschach,Ben Hur <bnhr.dev gmail.com>
 sbl,Stefan Blumentrath <stefan.blumentrath nina.no>
diff --git a/utils/svn_name_github_name.csv b/utils/svn_name_github_name.csv
index 55504c24d67..97f0f859267 100644
--- a/utils/svn_name_github_name.csv
+++ b/utils/svn_name_github_name.csv
@@ -1,56 +1,56 @@
 svn_name,github_name
 1gray,1gray
 aghisla,aghisla
-benjamin,benducke
+annakrat,petrasovaa
+barton,cmbarton
 benducke,benducke
+benjamin,benducke
 bernhard,bernhardreiter
-cnielsen,cdwren
-pvanbosgeo,ecodiv
-radim,blazek
-barton,cmbarton
-cmbarton,cmbarton
-michael,cmbarton
-mic,zwischenloesung
-maciej,czka
-msieczka,czka
+cepicky,jachym
+chemin,YannChemin
+cho,HuidaeCho
 clements,glynnc
+cmbarton,cmbarton
+cnielsen,cdwren
+frankw,warmerdam
 glynn,glynnc
 hamish,HamishB
-hellik,hellik
+hcho,HuidaeCho
 helena,hmitaso
-soeren,huhabla
+hellik,hellik
 huhabla,huhabla
-cho,HuidaeCho
-hcho,HuidaeCho
+isaacullah,isaacullah
 jachym,jachym
-cepicky,jachym
-william,kyngchaos
 kyngchaos,kyngchaos
 landa,landam
-martinl,landam
 ltoma,lauratoma
 lucadelu,lucadelu
+maciej,czka
 madi,madi
-mmetz,metzm
+markus,neteler
+martinl,landam
+michael,cmbarton
+mic,zwischenloesung
 mlennert,mlennert
+mmetz,metzm
 moritz,mlennert
-markus,neteler
+msieczka,czka
 neteler,neteler
 nikosa,NikosAlexandris
-sbl,ninsbl
-turek,ostepok
 paulo,paulomarcondes
-annakrat,petrasovaa
+pvanbosgeo,ecodiv
+radim,blazek
 rantolin,rantolin
 robertoa,rantolin
+sbl,ninsbl
 sholl,sholl
+soeren,huhabla
 stephan,sholl
+turek,ostepok
+ullah,isaacullah
 veroandreo,veroandreo
-frankw,warmerdam
 warmerdam,warmerdam
 wenzeslaus,wenzeslaus
-chemin,YannChemin
+william,kyngchaos
 ychemin,YannChemin
 zarch,zarch
-ullah,isaacullah
-isaacullah,isaacullah
diff --git a/utils/vagrant/compile.sh b/utils/vagrant/compile.sh
index 058eb70b1f9..5e1abc01735 100755
--- a/utils/vagrant/compile.sh
+++ b/utils/vagrant/compile.sh
@@ -19,31 +19,31 @@ cd /vagrant
 if [ ! -f "include/Make/Platform.make" ] ; then
     ./configure \
         --bindir=/usr/bin \
-        --srcdir=/vagrant \
-        --prefix=/usr/lib \
+        --enable-largefile \
         --enable-shared \
-        --with-postgres \
-        --with-mysql \
+        --prefix=/usr/lib \
+        --srcdir=/vagrant \
+        --with-blas \
+        --with-bzlib \
+        --with-cairo \
         --with-cxx \
-        --with-x \
+        --with-freetype \
+        --with-freetype-includes=/usr/include/freetype2 \
         --with-gdal \
         --with-geos \
-        --with-freetype \
-        --with-readline \
+        --with-lapack \
+        --with-mysql \
+        --with-mysql-includes=`mysql_config --include | sed -e 's/-I//'` \
+        --with-netcdf \
         --with-nls \
         --with-odbc \
-        --with-netcdf \
-        --with-blas \
-        --with-lapack \
-        --with-sqlite \
-        --enable-largefile \
-        --with-freetype-includes=/usr/include/freetype2 \
+        --with-postgres \
         --with-postgres-includes=`pg_config --includedir` \
-        --with-mysql-includes=`mysql_config --include | sed -e 's/-I//'` \
         --with-proj-share=/usr/share/proj \
-        --with-cairo \
         --with-pthread \
-        --with-bzlib \
+        --with-readline \
+        --with-sqlite \
+        --with-x \
         --without-pdal
 fi