diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..05c25f68d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    groups:
+      actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/check-releases.yml b/.github/workflows/check-releases.yml
index bb235dc15..a3ab8d6fc 100644
--- a/.github/workflows/check-releases.yml
+++ b/.github/workflows/check-releases.yml
@@ -4,6 +4,9 @@ name: hdf5 plugins check compression releases
 on:
   workflow_call:
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 jobs:
   check-compression-releases:
     runs-on: ubuntu-latest
@@ -170,7 +173,7 @@ jobs:
 
                # Save json report
     - name: Save json report
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7.0.1
       with:
         name: compression-versions
         path: versions-file.json
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index dedff2f0b..043a812be 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip-ci')"
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5.0.1
 
     - name: Run clang-format style check for C and Java code
       uses: DoozyX/clang-format-lint-action@v0.20
diff --git a/.github/workflows/clang-format-fix.yml b/.github/workflows/clang-format-fix.yml
index 93ed6506f..8e5f28beb 100644
--- a/.github/workflows/clang-format-fix.yml
+++ b/.github/workflows/clang-format-fix.yml
@@ -23,7 +23,7 @@ jobs:
     permissions:
         contents: write # In order to allow EndBug/add-and-commit to commit changes
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5.0.1
 
     - name: Fix C and Java formatting issues detected by clang-format
       uses: DoozyX/clang-format-lint-action@v0.20
diff --git a/.github/workflows/cmake-bintest.yml b/.github/workflows/cmake-bintest.yml
index 7b30e53a9..ea83352b6 100644
--- a/.github/workflows/cmake-bintest.yml
+++ b/.github/workflows/cmake-bintest.yml
@@ -22,6 +22,9 @@ on:
         required: true
         default: snapshots
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 permissions:
   contents: read
 
@@ -69,7 +72,7 @@ jobs:
 
       # Get files created by cmake-ctest script
       - name: Get published plugins binary (Windows)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: zip-vs2022_cl-binary
               path: ${{ github.workspace }}/hdf5
@@ -180,7 +183,7 @@ jobs:
 
       # Get files created by cmake-ctest script
       - name: Get published plugins binary (Linux)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-ubuntu-2404_gcc-binary
               path: ${{ github.workspace }}
@@ -281,7 +284,7 @@ jobs:
 
       # Get files created by cmake-ctest script
       - name: Get published binary (MacOS_latest)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: tgz-macos14_clang-binary
           path: ${{ github.workspace }}
diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml
index f7e9229c4..224ffde1b 100644
--- a/.github/workflows/cmake-ctest.yml
+++ b/.github/workflows/cmake-ctest.yml
@@ -50,6 +50,9 @@ on:
         AZURE_CERT_PROFILE_NAME:
             required: true
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 permissions:
   contents: read
 
@@ -166,7 +169,7 @@ jobs:
 
       # Get files created by release script
       - name: Get zip-tarball (Windows)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: zip-tarball
               path: ${{ github.workspace }}
@@ -256,14 +259,14 @@ jobs:
 
       # Save files created by ctest script
       - name: Save published binary (Windows)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: zip-vs2022_cl-binary
               path: ${{ runner.workspace }}/build/${{ steps.set-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
       - name: Save published msi binary (Windows)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: msi-vs2022_cl-binary
               path: ${{ runner.workspace }}/buildmsi/${{ steps.set-file-base.outputs.FILE_BASE }}-win-vs2022_cl.msi
@@ -348,7 +351,7 @@ jobs:
 
       # Get files created by release script
       - name: Get tgz-tarball (Linux)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-tarball
               path: ${{ github.workspace }}
@@ -402,21 +405,21 @@ jobs:
 
       # Save files created by ctest script
       - name: Save published binary (Linux)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: tgz-ubuntu-2404_gcc-binary
               path: ${{ runner.workspace }}/build/${{ steps.set-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.tar.gz
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
       - name: Save published binary deb (Linux)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: deb-ubuntu-2404_gcc-binary
               path: ${{ runner.workspace }}/builddeb/${{ steps.set-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.deb
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
       - name: Save published binary rpm (Linux)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: rpm-ubuntu-2404_gcc-binary
               path: ${{ runner.workspace }}/buildrpm/${{ steps.set-file-base.outputs.FILE_BASE }}-ubuntu-2404_gcc.rpm
@@ -527,7 +530,7 @@ jobs:
 
       # Get files created by release script
       - name: Get tgz-tarball (MacOS_latest)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-tarball
               path: ${{ github.workspace }}
@@ -663,14 +666,14 @@ jobs:
 
       # Save files created by ctest script
       - name: Save published binary (MacOS_latest)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: tgz-macos14_clang-binary
               path: ${{ runner.workspace }}/build/${{ steps.set-file-base.outputs.FILE_BASE }}-macos14_clang.tar.gz
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
       - name: Save published dmg binary (MacOS_latest)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: tgz-macos14_clang-dmg-binary
               path: ${{ runner.workspace }}/builddmg/${{ steps.set-file-base.outputs.FILE_BASE }}-macos14_clang.dmg
diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 57bfba709..5518903c0 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -27,6 +27,9 @@ on:
         required: true
         type: string
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 permissions:
   contents: read
 
@@ -120,7 +123,7 @@ jobs:
 
       # Get files created by release script
       - name: Get zip-tarball (Windows)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: zip-tarball
               path: ${{ github.workspace }}
@@ -178,7 +181,7 @@ jobs:
 
       # Save log files created by ctest script
       - name: Save log (Windows_intel)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: cl-win-log
           path: ${{ runner.workspace }}/hdf5_plugins/hdf5_plugins.log
@@ -256,7 +259,7 @@ jobs:
 
       # Get files created by release script
       - name: Get tgz-tarball (Linux)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-tarball
               path: ${{ github.workspace }}
@@ -305,7 +308,7 @@ jobs:
 
       # Save log files created by ctest script
       - name: Save log (Linux)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
             name: gcc-ubuntu-log
             path: ${{ runner.workspace }}/hdf5_plugins/hdf5_plugins.log
@@ -393,7 +396,7 @@ jobs:
 
       # Get files created by release script
       - name: Get tgz-tarball (MacOS_latest)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-tarball
               path: ${{ github.workspace }}
@@ -443,7 +446,7 @@ jobs:
 
       # Save log files created by ctest script
       - name: Save log (MacOS_latest)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: macos-log
           path: ${{ runner.workspace }}/hdf5_plugins/hdf5_plugins.log
@@ -537,7 +540,7 @@ jobs:
 
       # Get files created by release script
       - name: Get zip-tarball (Windows_intel)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: zip-tarball
               path: ${{ github.workspace }}
@@ -599,7 +602,7 @@ jobs:
 
       # Save log files created by ctest script
       - name: Save log (Windows_intel)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: intel-win-log
           path: ${{ runner.workspace }}/hdf5_plugins/hdf5_plugins.log
@@ -684,7 +687,7 @@ jobs:
 
       # Get files created by release script
       - name: Get tgz-tarball (Linux_intel)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-tarball
               path: ${{ github.workspace }}
@@ -736,7 +739,7 @@ jobs:
 
       # Save log files created by ctest script
       - name: Save log (Linux_intel)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: intel-ubuntu-log
           path: ${{ runner.workspace }}/hdf5_plugins/hdf5_plugins.log
diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 60b697b2f..4ac42bd37 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -12,6 +12,9 @@ on:
   pull_request:
     branches: [ "master" ]
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 permissions:
   contents: read
 
@@ -24,7 +27,7 @@ jobs:
       run-ignore: ${{ steps.getinputs.outputs.INPUTS_IGNORE }}
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v5.0.1
 
     - name: Get hdf5 release base name
       uses: dsaltares/fetch-gh-release-asset@master
diff --git a/.github/workflows/publish-branch.yml b/.github/workflows/publish-branch.yml
index 5e32577c6..beee64ee0 100644
--- a/.github/workflows/publish-branch.yml
+++ b/.github/workflows/publish-branch.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
         # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
         - name: Get Sources
-          uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7
+          uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
           with:
             fetch-depth: 0
             ref: '${{ github.head_ref || github.ref_name }}'
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 7622f8b6b..6d1454c29 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -13,6 +13,9 @@ on:
         type: string
         required: true
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 permissions:
   contents: read
 
@@ -22,7 +25,7 @@ jobs:
     steps:
         # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
         - name: Get Sources
-          uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7
+          uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
           with:
             fetch-depth: 0
             ref: '${{ github.head_ref || github.ref_name }}'
diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml
index f18b558cf..cad1b05c6 100644
--- a/.github/workflows/release-files.yml
+++ b/.github/workflows/release-files.yml
@@ -40,7 +40,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Get Sources
-        uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.7
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           fetch-depth: 0
           ref: '${{ github.head_ref || github.ref_name }}'
@@ -78,56 +78,56 @@ jobs:
 
       # Get files created by tarball script
       - name: Get tgz-tarball (Linux)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-tarball
               path: ${{ github.workspace }}
 
       - name: Get zip-tarball (Windows)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: zip-tarball
               path: ${{ github.workspace }}
 
       # Get files created by cmake-ctest script
       - name: Get published binary (Windows)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: zip-vs2022_cl-binary
               path: ${{ github.workspace }}
 
       - name: Get published msi binary (Windows)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: msi-vs2022_cl-binary
               path: ${{ github.workspace }}
 
       - name: Get published binary (MacOS)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-macos14_clang-binary
               path: ${{ github.workspace }}
 
       - name: Get published dmg binary (MacOS)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-macos14_clang-dmg-binary
               path: ${{ github.workspace }}
 
       - name: Get published binary (Linux)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: tgz-ubuntu-2404_gcc-binary
               path: ${{ github.workspace }}
 
       - name: Get published deb binary (Linux)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: deb-ubuntu-2404_gcc-binary
               path: ${{ github.workspace }}
 
       - name: Get published rpm binary (Linux)
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
               name: rpm-ubuntu-2404_gcc-binary
               path: ${{ github.workspace }}
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index 0b9150e68..61e00fba3 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -36,6 +36,9 @@ on:
         description: "The sha used for the source tarballs"
         value: ${{ jobs.check_commits.outputs.branch_sha }}
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
 permissions:
   contents: read
 
@@ -48,7 +51,7 @@ jobs:
       branch_ref: ${{ steps.get-branch-name.outputs.BRANCH_REF }}
       branch_sha: ${{ steps.get-branch-sha.outputs.BRANCH_SHA }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5.0.1
 
     - name: Get branch name
       id: get-branch-name
@@ -98,7 +101,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Get Sources
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v5.0.1
         with:
           path: hdfsrc
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || needs.check_commits.outputs.branch_ref }}
@@ -114,7 +117,7 @@ jobs:
         run: |
           if [[ '${{ inputs.use_environ }}' == 'snapshots' ]]
           then
-            FILE_NAME_BASE=$(echo "hdf5_plugins-${{ needs.check_commits.outputs.branch_ref }}-${{ needs.check_commits.outputs.branch_sha }}")
+            FILE_NAME_BASE=$(echo "hdf5_plugins-${{ needs.check_commits.outputs.branch_ref }}-${{ needs.check_commits.outputs.branch_sha }}" | tr '/' '-')
           else
             if [[ '${{ inputs.use_tag }}' == 'snapshot' ]]
             then
@@ -155,14 +158,14 @@ jobs:
 
       # Save files created by release script
       - name: Save tgz-tarball
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: tgz-tarball
               path: ${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
       - name: Save zip-tarball
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
               name: zip-tarball
               path: ${{ steps.set-file-base.outputs.FILE_BASE }}.zip
diff --git a/BITGROOM/config/cmake/binex/example/CMakeLists.txt b/BITGROOM/config/cmake/binex/example/CMakeLists.txt
index d2d77cb49..94967e3b5 100644
--- a/BITGROOM/config/cmake/binex/example/CMakeLists.txt
+++ b/BITGROOM/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BITGROOM/example/CMakeLists.txt b/BITGROOM/example/CMakeLists.txt
index 6aaa2d549..8dc523d10 100755
--- a/BITGROOM/example/CMakeLists.txt
+++ b/BITGROOM/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BITROUND/config/cmake/binex/example/CMakeLists.txt b/BITROUND/config/cmake/binex/example/CMakeLists.txt
index 95d00a803..e5ece574a 100644
--- a/BITROUND/config/cmake/binex/example/CMakeLists.txt
+++ b/BITROUND/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BITROUND/example/CMakeLists.txt b/BITROUND/example/CMakeLists.txt
index a6370fc2e..2d2171645 100644
--- a/BITROUND/example/CMakeLists.txt
+++ b/BITROUND/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BLOSC/CMakeLists.txt b/BLOSC/CMakeLists.txt
index 657cfc3b0..93a5b5117 100644
--- a/BLOSC/CMakeLists.txt
+++ b/BLOSC/CMakeLists.txt
@@ -132,7 +132,11 @@ option (HDF_ENABLE_BLOSC_ZLIB_SUPPORT "Enable BLOSC Zlib Filters" ON)
 if (HDF_ENABLE_BLOSC_ZLIB_SUPPORT)
   if (NOT BLOSC_ZLIB_HEADER)
     if (NOT BLOSC_ZLIB_USE_EXTERNAL)
-      find_package (ZLIB NAMES ${BLOSC_ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static)
+      if (WIN32)
+        find_package (ZLIB NAMES ${BLOSC_ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT})
+      else ()
+        find_package (ZLIB NAMES ${BLOSC_ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static)
+      endif ()
       if (NOT ZLIB_FOUND)
         find_package (ZLIB) # Legacy find
         if (ZLIB_FOUND)
diff --git a/BLOSC/config/cmake/binex/example/CMakeLists.txt b/BLOSC/config/cmake/binex/example/CMakeLists.txt
index 4569df5a0..3b16037b8 100644
--- a/BLOSC/config/cmake/binex/example/CMakeLists.txt
+++ b/BLOSC/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BLOSC/example/CMakeLists.txt b/BLOSC/example/CMakeLists.txt
index 493962d8c..9d3620ba5 100644
--- a/BLOSC/example/CMakeLists.txt
+++ b/BLOSC/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BLOSC2/config/cmake/binex/example/CMakeLists.txt b/BLOSC2/config/cmake/binex/example/CMakeLists.txt
index 83f828273..9c52bc3db 100644
--- a/BLOSC2/config/cmake/binex/example/CMakeLists.txt
+++ b/BLOSC2/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BLOSC2/example/CMakeLists.txt b/BLOSC2/example/CMakeLists.txt
index 8fc47b8b0..2df05c459 100644
--- a/BLOSC2/example/CMakeLists.txt
+++ b/BLOSC2/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BSHUF/config/cmake/binex/example/CMakeLists.txt b/BSHUF/config/cmake/binex/example/CMakeLists.txt
index 9d4d641aa..dc708d67d 100644
--- a/BSHUF/config/cmake/binex/example/CMakeLists.txt
+++ b/BSHUF/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BSHUF/example/CMakeLists.txt b/BSHUF/example/CMakeLists.txt
index cc9c3a4cf..cd7e95116 100755
--- a/BSHUF/example/CMakeLists.txt
+++ b/BSHUF/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BZIP2/config/cmake/binex/example/CMakeLists.txt b/BZIP2/config/cmake/binex/example/CMakeLists.txt
index bb7e46333..52bf42675 100644
--- a/BZIP2/config/cmake/binex/example/CMakeLists.txt
+++ b/BZIP2/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/BZIP2/example/CMakeLists.txt b/BZIP2/example/CMakeLists.txt
index f33d06c7a..3767dbe9b 100644
--- a/BZIP2/example/CMakeLists.txt
+++ b/BZIP2/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/JPEG/config/cmake/binex/example/CMakeLists.txt b/JPEG/config/cmake/binex/example/CMakeLists.txt
index d393a2e39..4c6225355 100644
--- a/JPEG/config/cmake/binex/example/CMakeLists.txt
+++ b/JPEG/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/JPEG/example/CMakeLists.txt b/JPEG/example/CMakeLists.txt
index 849300c56..d0480fd77 100644
--- a/JPEG/example/CMakeLists.txt
+++ b/JPEG/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/LZ4/config/cmake/binex/example/CMakeLists.txt b/LZ4/config/cmake/binex/example/CMakeLists.txt
index 60b705a15..6daef02bc 100644
--- a/LZ4/config/cmake/binex/example/CMakeLists.txt
+++ b/LZ4/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE} " " " ")
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/LZ4/example/CMakeLists.txt b/LZ4/example/CMakeLists.txt
index 4d4264139..2a4912033 100755
--- a/LZ4/example/CMakeLists.txt
+++ b/LZ4/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/LZF/config/cmake/binex/example/CMakeLists.txt b/LZF/config/cmake/binex/example/CMakeLists.txt
index 02f8e2cb4..694c0c802 100644
--- a/LZF/config/cmake/binex/example/CMakeLists.txt
+++ b/LZF/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/LZF/example/CMakeLists.txt b/LZF/example/CMakeLists.txt
index e2d14d23e..dd3cd7d22 100755
--- a/LZF/example/CMakeLists.txt
+++ b/LZF/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/ZFP/config/cmake/binex/example/CMakeLists.txt b/ZFP/config/cmake/binex/example/CMakeLists.txt
index 6c21f4f38..dece8fa90 100644
--- a/ZFP/config/cmake/binex/example/CMakeLists.txt
+++ b/ZFP/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/ZFP/example/CMakeLists.txt b/ZFP/example/CMakeLists.txt
index 53e58fd8c..ec7e40d9e 100644
--- a/ZFP/example/CMakeLists.txt
+++ b/ZFP/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/ZSTD/config/cmake/binex/example/CMakeLists.txt b/ZSTD/config/cmake/binex/example/CMakeLists.txt
index 1da1d1094..d784544b8 100644
--- a/ZSTD/config/cmake/binex/example/CMakeLists.txt
+++ b/ZSTD/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/ZSTD/example/CMakeLists.txt b/ZSTD/example/CMakeLists.txt
index 9283ab60d..44e946325 100644
--- a/ZSTD/example/CMakeLists.txt
+++ b/ZSTD/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/community/MAFISC/config/cmake/binex/example/CMakeLists.txt b/community/MAFISC/config/cmake/binex/example/CMakeLists.txt
index 0bdbae83c..d5546200b 100644
--- a/community/MAFISC/config/cmake/binex/example/CMakeLists.txt
+++ b/community/MAFISC/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/community/MAFISC/example/CMakeLists.txt b/community/MAFISC/example/CMakeLists.txt
index 55e86a3c2..d187e149e 100755
--- a/community/MAFISC/example/CMakeLists.txt
+++ b/community/MAFISC/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/community/SZ/config/cmake/binex/example/CMakeLists.txt b/community/SZ/config/cmake/binex/example/CMakeLists.txt
index 6938ea000..4a5c0eb03 100644
--- a/community/SZ/config/cmake/binex/example/CMakeLists.txt
+++ b/community/SZ/config/cmake/binex/example/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/community/SZ/example/CMakeLists.txt b/community/SZ/example/CMakeLists.txt
index 9774ca950..587702610 100755
--- a/community/SZ/example/CMakeLists.txt
+++ b/community/SZ/example/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach (example ${dyn_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()
 
diff --git a/config/cmake/binex/example/CMakeLists.txt b/config/cmake/binex/example/CMakeLists.txt
index a2638963d..26e6f0965 100644
--- a/config/cmake/binex/example/CMakeLists.txt
+++ b/config/cmake/binex/example/CMakeLists.txt
@@ -62,7 +62,7 @@ foreach (example ${dyn_examples} ${extra_examples})
   TARGET_C_PROPERTIES (${example} ${LIB_TYPE})
   target_link_libraries (${example} PRIVATE ${H5PL_HDF5_LINK_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${example} PRIVATE dl)
+    target_link_libraries (${example} PRIVATE ${CMAKE_DL_LIBS})
   endif ()
 endforeach ()