diff --git a/BLOSC/config/cmake/ConfigureChecks.cmake b/BLOSC/config/cmake/ConfigureChecks.cmake
index ada5643a..a7fbd78f 100644
--- a/BLOSC/config/cmake/ConfigureChecks.cmake
+++ b/BLOSC/config/cmake/ConfigureChecks.cmake
@@ -180,13 +180,9 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
     )
     if (${OTHER_TEST})
       set (${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
       set (${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Performing Other Test ${OTHER_TEST} failed with the following output:\n"
@@ -243,23 +239,17 @@ if (MINGW OR NOT WINDOWS)
         set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
         set (LARGEFILE 1)
         set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... yes")
-        endif ()
+        message (VERBOSE "${msg}... yes")
       else ()
         set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-        endif ()
+        message (VERBOSE "${msg}... no")
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
               "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
         )
       endif ()
     else ()
       set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-      endif ()
+      message (VERBOSE "${msg}... no")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Test TEST_LFS_WORKS Compile failed\n"
       )
diff --git a/BLOSC/config/cmake/H5PL_Examples.cmake.in b/BLOSC/config/cmake/H5PL_Examples.cmake.in
index cc5d32e9..c0e473d4 100644
--- a/BLOSC/config/cmake/H5PL_Examples.cmake.in
+++ b/BLOSC/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.15
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,20 +88,20 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
 if(WIN32)
   set (SITE_OS_NAME "Windows")
-  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}")
+  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
   set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
   set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
   set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
   set (ENV{PATH} "$ENV{PATH};${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 else()
-  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}")
+  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
   set (ENV{LD_LIBRARY_PATH} "${HDF5INSTALLDIR}/lib")
   set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
   set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
diff --git a/BLOSC/config/cmake/HDFMacros.cmake b/BLOSC/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/BLOSC/config/cmake/HDFMacros.cmake
+++ b/BLOSC/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BLOSC/config/cmake/HDFPluginMacros.cmake b/BLOSC/config/cmake/HDFPluginMacros.cmake
index a820908e..b5adf3f8 100644
--- a/BLOSC/config/cmake/HDFPluginMacros.cmake
+++ b/BLOSC/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/BLOSC/config/cmake/README.txt.cmake.in b/BLOSC/config/cmake/README.txt.cmake.in
index 3c532167..b4548a7b 100644
--- a/BLOSC/config/cmake/README.txt.cmake.in
+++ b/BLOSC/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION_MAJOR@.@H5BLOSC_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5BLOSC_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5BLOSC_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/BLOSC/config/cmake/binex/Using_CMake.txt b/BLOSC/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/BLOSC/config/cmake/binex/Using_CMake.txt
+++ b/BLOSC/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/BLOSC/config/cmake/binex/config/cmake/HDFMacros.cmake b/BLOSC/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/BLOSC/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/BLOSC/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BSHUF/config/cmake/ConfigureChecks.cmake b/BSHUF/config/cmake/ConfigureChecks.cmake
index 4ab1ce9f..cab38e15 100644
--- a/BSHUF/config/cmake/ConfigureChecks.cmake
+++ b/BSHUF/config/cmake/ConfigureChecks.cmake
@@ -180,13 +180,9 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
     )
     if (${OTHER_TEST})
       set (${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
       set (${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Performing Other Test ${OTHER_TEST} failed with the following output:\n"
@@ -243,23 +239,17 @@ if (MINGW OR NOT WINDOWS)
         set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
         set (LARGEFILE 1)
         set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... yes")
-        endif ()
+        message (VERBOSE "${msg}... yes")
       else ()
         set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-        endif ()
+        message (VERBOSE "${msg}... no")
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
               "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
         )
       endif ()
     else ()
       set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-      endif ()
+      message (VERBOSE "${msg}... no")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Test TEST_LFS_WORKS Compile failed\n"
       )
diff --git a/BSHUF/config/cmake/H5PL_Examples.cmake.in b/BSHUF/config/cmake/H5PL_Examples.cmake.in
index 5e63afec..4bad1aec 100644
--- a/BSHUF/config/cmake/H5PL_Examples.cmake.in
+++ b/BSHUF/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
@@ -101,7 +101,7 @@ if(WIN32)
   set (ENV{PATH} "$ENV{PATH};${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 else()
-  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/share/")
+  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
   set (ENV{LD_LIBRARY_PATH} "${HDF5INSTALLDIR}/lib")
   set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
   set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
diff --git a/BSHUF/config/cmake/HDFMacros.cmake b/BSHUF/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/BSHUF/config/cmake/HDFMacros.cmake
+++ b/BSHUF/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BSHUF/config/cmake/HDFPluginMacros.cmake b/BSHUF/config/cmake/HDFPluginMacros.cmake
index e4ac156e..0e4b9323 100644
--- a/BSHUF/config/cmake/HDFPluginMacros.cmake
+++ b/BSHUF/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/BSHUF/config/cmake/README.txt.cmake.in b/BSHUF/config/cmake/README.txt.cmake.in
index 916397da..deec0f66 100644
--- a/BSHUF/config/cmake/README.txt.cmake.in
+++ b/BSHUF/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5BSHUF_PACKAGE_NAME@-@H5BSHUF_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5BSHUF_PACKAGE_NAME@-@H5BSHUF_PACKAGE_VERSION_MAJOR@.@H5BSHUF_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5BSHUF_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5BSHUF_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5BSHUF_PACKAGE_NAME@-@H5BSHUF_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/BSHUF/config/cmake/binex/Using_CMake.txt b/BSHUF/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/BSHUF/config/cmake/binex/Using_CMake.txt
+++ b/BSHUF/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/BSHUF/config/cmake/binex/config/cmake/HDFMacros.cmake b/BSHUF/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/BSHUF/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/BSHUF/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BZIP2/config/cmake/H5PL_Examples.cmake.in b/BZIP2/config/cmake/H5PL_Examples.cmake.in
index 49c44590..08a99786 100644
--- a/BZIP2/config/cmake/H5PL_Examples.cmake.in
+++ b/BZIP2/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/BZIP2/config/cmake/HDFMacros.cmake b/BZIP2/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/BZIP2/config/cmake/HDFMacros.cmake
+++ b/BZIP2/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BZIP2/config/cmake/HDFPluginMacros.cmake b/BZIP2/config/cmake/HDFPluginMacros.cmake
index 25bebccb..873efbdb 100644
--- a/BZIP2/config/cmake/HDFPluginMacros.cmake
+++ b/BZIP2/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/BZIP2/config/cmake/README.txt.cmake.in b/BZIP2/config/cmake/README.txt.cmake.in
index 3470fdfc..bc4c2341 100644
--- a/BZIP2/config/cmake/README.txt.cmake.in
+++ b/BZIP2/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5BZ2_PACKAGE_NAME@-@H5BZ2_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5BZ2_PACKAGE_NAME@-@H5BZ2_PACKAGE_VERSION_MAJOR@.@H5BZ2_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5BZ2_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5BZ2_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5BZ2_PACKAGE_NAME@-@H5BZ2_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/BZIP2/config/cmake/binex/Using_CMake.txt b/BZIP2/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/BZIP2/config/cmake/binex/Using_CMake.txt
+++ b/BZIP2/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/BZIP2/config/cmake/binex/config/cmake/HDFMacros.cmake b/BZIP2/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/BZIP2/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/BZIP2/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BZIP2/example/test/testCM.sh b/BZIP2/example/test/testCM.sh
index 8cab4211..67ded1fa 100644
--- a/BZIP2/example/test/testCM.sh
+++ b/BZIP2/example/test/testCM.sh
@@ -10,7 +10,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 
-# This file is for use of h5cc created with the CMake process
+# This file is for use of h5cc created with the autotools process
 # HDF5_HOME is expected to be set
 
 srcdir=..
@@ -31,12 +31,12 @@ if ! test -f $H5CC; then
 fi
 
 case $H5CC in
-*/*)    H5DUMP=`echo $H5CC | sed -e 's/\/[^/]*$/\/h5dump-shared/'`;
-        test -x $H5DUMP || H5DUMP=h5dump-shared;
-        H5REPACK=`echo $H5CC | sed -e 's/\/[^/]*$/\/h5repack-shared/'`;
-        test -x $H5REPACK || H5REPACK=h5repack-shared;;
-*)      H5DUMP=h5dump-shared;
-        H5REPACK=h5repack-shared;;
+*/*)    H5DUMP=`echo $H5CC | sed -e 's/\/[^/]*$/\/h5dump/'`;
+        test -x $H5DUMP || H5DUMP=h5dump;
+        H5REPACK=`echo $H5CC | sed -e 's/\/[^/]*$/\/h5repack/'`;
+        test -x $H5REPACK || H5REPACK=h5repack;;
+*)      H5DUMP=h5dump;
+        H5REPACK=h5repack;;
 esac
 
 # Shell commands used in Makefiles
@@ -55,7 +55,7 @@ ENVCMD="env HDF5_PLUGIN_PATH=$LD_LIBRARY_PATH/plugin"
 TESTDIR=$builddir
 
 
-$H5CC $srcdir/h5ex_d_bzip2.c -o h5ex_d_bzip2
+$H5CC -shlib $srcdir/h5ex_d_bzip2.c -o h5ex_d_bzip2
 
 SRC_TESTFILES="$srcdir/testfiles"
 LIST_TEST_FILES="
diff --git a/README.txt b/Building.txt
similarity index 98%
rename from README.txt
rename to Building.txt
index 92967094..ee834bbd 100644
--- a/README.txt
+++ b/Building.txt
@@ -1,4 +1,4 @@
-HDF5 1.10 plugins
+HDF5 1.15 plugins
 Building these filter/example requires knowledge of the hdf5 and the
 compression library installation. Out-of-source build process is expected.
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bbe70af..9bdbb2e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ BASIC_SETTINGS (${PL_PACKAGE_NAME})
 set (H5PL_VERS_MAJOR "1")
 set (H5PL_VERS_MINOR "10")
 set (H5PL_VERS_RELEASE "10")
-set (H5PL_OVERRIDE_VERSION "1.10.10")
+set (H5PL_OVERRIDE_VERSION "1.${H5PL_VERS_MINOR}.${H5PL_VERS_RELEASE}")
 
 set (H5PL_SOVERS_MAJOR 1)
 set (H5PL_SOVERS_MINOR 0)
diff --git a/JPEG/config/cmake/H5PL_Examples.cmake.in b/JPEG/config/cmake/H5PL_Examples.cmake.in
index c5a3bcea..5f297d89 100644
--- a/JPEG/config/cmake/H5PL_Examples.cmake.in
+++ b/JPEG/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/JPEG/config/cmake/HDFMacros.cmake b/JPEG/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/JPEG/config/cmake/HDFMacros.cmake
+++ b/JPEG/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/JPEG/config/cmake/HDFPluginMacros.cmake b/JPEG/config/cmake/HDFPluginMacros.cmake
index ed767d9f..33ac0847 100644
--- a/JPEG/config/cmake/HDFPluginMacros.cmake
+++ b/JPEG/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/JPEG/config/cmake/README.txt.cmake.in b/JPEG/config/cmake/README.txt.cmake.in
index 28557039..5112597f 100644
--- a/JPEG/config/cmake/README.txt.cmake.in
+++ b/JPEG/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5JPEG_PACKAGE_NAME@-@H5JPEG_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5JPEG_PACKAGE_NAME@-@H5JPEG_PACKAGE_VERSION_MAJOR@.@H5JPEG_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5JPEG_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5JPEG_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5JPEG_PACKAGE_NAME@-@H5JPEG_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
@@ -100,6 +100,6 @@ Execute the test.sh script.
 ===========================================================================
 
 Documentation for this release can be found at the following URL:
-    http://www.hdfgroup.org/doc.html
+    https://portal.hdfgroup.org/display/support
 
 Bugs should be reported to help@hdfgroup.org.
diff --git a/JPEG/config/cmake/binex/Using_CMake.txt b/JPEG/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/JPEG/config/cmake/binex/Using_CMake.txt
+++ b/JPEG/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/JPEG/config/cmake/binex/config/cmake/HDFMacros.cmake b/JPEG/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/JPEG/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/JPEG/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/LZ4/config/cmake/ConfigureChecks.cmake b/LZ4/config/cmake/ConfigureChecks.cmake
index 4af0ee13..bd184188 100644
--- a/LZ4/config/cmake/ConfigureChecks.cmake
+++ b/LZ4/config/cmake/ConfigureChecks.cmake
@@ -127,6 +127,9 @@ CHECK_INCLUDE_FILE_CONCAT ("inttypes.h"      HAVE_INTTYPES_H)
 # _Bool type support
 CHECK_INCLUDE_FILE_CONCAT (stdbool.h    HAVE_STDBOOL_H)
 
+CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h"    HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILE_CONCAT ("arpa/inet.h"     HAVE_ARPA_INET_H)
+
 #-----------------------------------------------------------------------------
 #  Check for the math library "m"
 #-----------------------------------------------------------------------------
@@ -140,6 +143,19 @@ endif ()
 # UCB (BSD) compatibility library
 CHECK_LIBRARY_EXISTS_CONCAT ("ucb"    gethostname  HAVE_LIBUCB)
 
+if (NOT WINDOWS)
+  CHECK_FUNCTION_EXISTS (ntohl             HAVE_NTOHL)
+  CHECK_FUNCTION_EXISTS (htonl             HAVE_HTONL)
+  CHECK_FUNCTION_EXISTS (ntohs             HAVE_NTOHS)
+  CHECK_FUNCTION_EXISTS (htons             HAVE_HTONS)
+else ()
+  set (CMAKE_REQUIRED_LIBRARIES "ws2_32")
+  check_symbol_exists (ntohl "winsock2.h" HAVE_NTOHL)
+  check_symbol_exists (htonl "winsock2.h" HAVE_HTONL)
+  check_symbol_exists (ntohs "winsock2.h" HAVE_NTOHS)
+  check_symbol_exists (htons "winsock2.h" HAVE_HTONS)
+endif ()
+
 # For other tests to use the same libraries
 set (HDF_REQUIRED_LIBRARIES ${HDF_REQUIRED_LIBRARIES} ${LINK_LIBS})
 
diff --git a/LZ4/config/cmake/H5PL_Examples.cmake.in b/LZ4/config/cmake/H5PL_Examples.cmake.in
index 1715c395..541dd5ca 100644
--- a/LZ4/config/cmake/H5PL_Examples.cmake.in
+++ b/LZ4/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/LZ4/config/cmake/HDFMacros.cmake b/LZ4/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/LZ4/config/cmake/HDFMacros.cmake
+++ b/LZ4/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/LZ4/config/cmake/HDFPluginMacros.cmake b/LZ4/config/cmake/HDFPluginMacros.cmake
index 36e12fac..f0090409 100644
--- a/LZ4/config/cmake/HDFPluginMacros.cmake
+++ b/LZ4/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/LZ4/config/cmake/README.txt.cmake.in b/LZ4/config/cmake/README.txt.cmake.in
index 24952d7c..a1cda81c 100644
--- a/LZ4/config/cmake/README.txt.cmake.in
+++ b/LZ4/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5LZ4_PACKAGE_NAME@-@H5LZ4_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5LZ4_PACKAGE_NAME@-@H5LZ4_PACKAGE_VERSION_MAJOR@.@H5LZ4_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5LZ4_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5LZ4_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5LZ4_PACKAGE_NAME@-@H5LZ4_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/LZ4/config/cmake/binex/Using_CMake.txt b/LZ4/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/LZ4/config/cmake/binex/Using_CMake.txt
+++ b/LZ4/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/LZ4/config/cmake/binex/config/cmake/HDFMacros.cmake b/LZ4/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/LZ4/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/LZ4/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/LZ4/example/test/test.sh b/LZ4/example/test/test.sh
index 77dbb76f..eeb88a72 100644
--- a/LZ4/example/test/test.sh
+++ b/LZ4/example/test/test.sh
@@ -1,17 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 # This file is for use of h5cc created with the autotools process
 # HDF5_HOME is expected to be set
diff --git a/LZ4/example/test/testCM.sh b/LZ4/example/test/testCM.sh
index a8a20430..b6f88019 100644
--- a/LZ4/example/test/testCM.sh
+++ b/LZ4/example/test/testCM.sh
@@ -1,17 +1,14 @@
 #! /bin/sh
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 
 # This file is for use of h5cc created with the CMake process
 # HDF5_HOME is expected to be set
diff --git a/LZF/config/cmake/H5PL_Examples.cmake.in b/LZF/config/cmake/H5PL_Examples.cmake.in
index 87bc4291..b5a7eb18 100644
--- a/LZF/config/cmake/H5PL_Examples.cmake.in
+++ b/LZF/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/LZF/config/cmake/HDFMacros.cmake b/LZF/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/LZF/config/cmake/HDFMacros.cmake
+++ b/LZF/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/LZF/config/cmake/HDFPluginMacros.cmake b/LZF/config/cmake/HDFPluginMacros.cmake
index 7a44be6a..cda4ba39 100644
--- a/LZF/config/cmake/HDFPluginMacros.cmake
+++ b/LZF/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/LZF/config/cmake/README.txt.cmake.in b/LZF/config/cmake/README.txt.cmake.in
index 57ff3a42..bdd48379 100644
--- a/LZF/config/cmake/README.txt.cmake.in
+++ b/LZF/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5LZF_PACKAGE_NAME@-@H5LZF_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5LZF_PACKAGE_NAME@-@H5LZF_PACKAGE_VERSION_MAJOR@.@H5LZF_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5LZF_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5LZF_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5LZF_PACKAGE_NAME@-@H5LZF_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/LZF/config/cmake/binex/Using_CMake.txt b/LZF/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/LZF/config/cmake/binex/Using_CMake.txt
+++ b/LZF/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/LZF/config/cmake/binex/config/cmake/HDFMacros.cmake b/LZF/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/LZF/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/LZF/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/MAFISC/config/cmake/H5PL_Examples.cmake.in b/MAFISC/config/cmake/H5PL_Examples.cmake.in
index fae1dbec..890b8952 100644
--- a/MAFISC/config/cmake/H5PL_Examples.cmake.in
+++ b/MAFISC/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/MAFISC/config/cmake/HDFMacros.cmake b/MAFISC/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/MAFISC/config/cmake/HDFMacros.cmake
+++ b/MAFISC/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/MAFISC/config/cmake/HDFPluginMacros.cmake b/MAFISC/config/cmake/HDFPluginMacros.cmake
index 12f25418..999bd185 100644
--- a/MAFISC/config/cmake/HDFPluginMacros.cmake
+++ b/MAFISC/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/MAFISC/config/cmake/README.txt.cmake.in b/MAFISC/config/cmake/README.txt.cmake.in
index acfdc6fe..ffc34bc0 100644
--- a/MAFISC/config/cmake/README.txt.cmake.in
+++ b/MAFISC/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5MAFISC_PACKAGE_NAME@-@H5MAFISC_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5MAFISC_PACKAGE_NAME@-@H5MAFISC_PACKAGE_VERSION_MAJOR@.@H5MAFISC_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5MAFISC_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5MAFISC_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5MAFISC_PACKAGE_NAME@-@H5MAFISC_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/MAFISC/config/cmake/binex/Using_CMake.txt b/MAFISC/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/MAFISC/config/cmake/binex/Using_CMake.txt
+++ b/MAFISC/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/MAFISC/config/cmake/binex/config/cmake/HDFMacros.cmake b/MAFISC/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/MAFISC/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/MAFISC/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/MAFISC/src/liblzma/Makefile.am b/MAFISC/src/liblzma/Makefile.am
index 819d5a5e..740081dd 100644
--- a/MAFISC/src/liblzma/Makefile.am
+++ b/MAFISC/src/liblzma/Makefile.am
@@ -50,7 +50,7 @@ endif
 ## Windows-specific stuff
 
 # Windows resource compiler support. libtool knows what to do with .rc
-# files, but Automake (<= 1.13 at least) doesn't know.
+# files, but Automake (<= 1.15 at least) doesn't know.
 #
 # We want the resource file only in shared liblzma. To avoid linking it into
 # static liblzma, we overwrite the static object file with an object file
diff --git a/MAFISC/src/liblzma/Makefile.in b/MAFISC/src/liblzma/Makefile.in
index 71a2bce4..8a25fa4e 100644
--- a/MAFISC/src/liblzma/Makefile.in
+++ b/MAFISC/src/liblzma/Makefile.in
@@ -1738,7 +1738,7 @@ uninstall-am: uninstall-docDATA uninstall-libLTLIBRARIES \
 
 
 # Windows resource compiler support. libtool knows what to do with .rc
-# files, but Automake (<= 1.13 at least) doesn't know.
+# files, but Automake (<= 1.15 at least) doesn't know.
 #
 # We want the resource file only in shared liblzma. To avoid linking it into
 # static liblzma, we overwrite the static object file with an object file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..0688ee56
--- /dev/null
+++ b/README.md
@@ -0,0 +1,64 @@
+HDF5 Compression Plugins
+
+*Please refer to the Building.txt file for installation instructions.*
+
+This repository contains compression plugin code for the library that implement the
+HDF5® data model API. The HDF5® data model has been adopted across
+many industries and this implementation has become a de facto data management standard
+in science, engineering, and research communities worldwide.
+
+The HDF Group is the developer, maintainer, and steward of HDF5 software. Find more
+information about The HDF Group, the HDF5 Community, and other HDF5 software projects,
+tools, and services at The HDF Group's website.
+    
+   https://www.hdfgroup.org/
+
+
+
+HELP AND SUPPORT
+----------------
+Information regarding Help Desk and Support services is available at
+
+   https://portal.hdfgroup.org/display/support/The+HDF+Help+Desk
+
+
+
+FORUM and NEWS
+--------------
+The following public forums are provided for public announcements and discussions
+of interest to the general HDF5 Community.
+
+   - Homepage of the Forum
+   https://forum.hdfgroup.org
+
+   - News and Announcement
+   https://forum.hdfgroup.org/c/news-and-announcements-from-the-hdf-group
+
+   - HDF5 and HDF4 Topics
+   https://forum.hdfgroup.org/c/hdf5
+
+These forums are provided as an open and public service for searching and reading.
+Posting requires completing a simple registration and allows one to join in the
+conversation.  Please read the following instructions pertaining to the Forum's
+use and configuration
+    https://forum.hdfgroup.org/t/quickstart-guide-welcome-to-the-new-hdf-forum
+
+
+HDF5 SNAPSHOTS, PREVIOUS RELEASES AND SOURCE CODE
+--------------------------------------------
+Full Documentation and Programming Resources for this HDF5 can be found at
+
+   https://portal.hdfgroup.org/display/HDF5
+
+Periodically development code snapshots are provided at the following URL:
+    
+   https://gamma.hdfgroup.org/ftp/pub/outgoing/hdf5/snapshots/
+
+Source packages for current and previous releases are located at:
+    
+   https://portal.hdfgroup.org/display/support/Downloads
+
+Development code is available at our Github location:
+    
+   https://github.com/HDFGroup/hdf5.git
+
diff --git a/SZ/config/cmake/H5PL_Examples.cmake.in b/SZ/config/cmake/H5PL_Examples.cmake.in
index 02ba7a39..37bc16a5 100644
--- a/SZ/config/cmake/H5PL_Examples.cmake.in
+++ b/SZ/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/SZ/config/cmake/HDFMacros.cmake b/SZ/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/SZ/config/cmake/HDFMacros.cmake
+++ b/SZ/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/SZ/config/cmake/HDFPluginMacros.cmake b/SZ/config/cmake/HDFPluginMacros.cmake
index 932b3df7..4cb9e457 100644
--- a/SZ/config/cmake/HDFPluginMacros.cmake
+++ b/SZ/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/SZ/config/cmake/README.txt.cmake.in b/SZ/config/cmake/README.txt.cmake.in
index 5549585a..3aba8254 100644
--- a/SZ/config/cmake/README.txt.cmake.in
+++ b/SZ/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of 
-@H5SZ_PACKAGE_NAME@-@H5SZ_PACKAGE_VERSION_MAJOR@ that was compiled on; 
+@H5SZ_PACKAGE_NAME@-@H5SZ_PACKAGE_VERSION_MAJOR@.@H5SZ_PACKAGE_VERSION_MINOR@ that was compiled on; 
     @BINARY_PLATFORM@. 
  
 It was built with the following options: 
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5SZ_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5SZ_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5SZ_PACKAGE_NAME@-@H5SZ_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/SZ/config/cmake/binex/Using_CMake.txt b/SZ/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/SZ/config/cmake/binex/Using_CMake.txt
+++ b/SZ/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/SZ/config/cmake/binex/config/cmake/HDFMacros.cmake b/SZ/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/SZ/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/SZ/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/ZFP/config/cmake/H5PL_Examples.cmake.in b/ZFP/config/cmake/H5PL_Examples.cmake.in
index 04657b83..d99c2cc5 100644
--- a/ZFP/config/cmake/H5PL_Examples.cmake.in
+++ b/ZFP/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/ZFP/config/cmake/HDFMacros.cmake b/ZFP/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/ZFP/config/cmake/HDFMacros.cmake
+++ b/ZFP/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/ZFP/config/cmake/HDFPluginMacros.cmake b/ZFP/config/cmake/HDFPluginMacros.cmake
index 8e27a941..d7b8805a 100644
--- a/ZFP/config/cmake/HDFPluginMacros.cmake
+++ b/ZFP/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/ZFP/config/cmake/README.txt.cmake.in b/ZFP/config/cmake/README.txt.cmake.in
index ffb8a8b2..7951c7d6 100644
--- a/ZFP/config/cmake/README.txt.cmake.in
+++ b/ZFP/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5ZFP_PACKAGE_NAME@-@H5ZFP_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5ZFP_PACKAGE_NAME@-@H5ZFP_PACKAGE_VERSION_MAJOR@.@H5ZFP_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5ZFP_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5ZFP_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5ZFP_PACKAGE_NAME@-@H5ZFP_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/ZFP/config/cmake/binex/Using_CMake.txt b/ZFP/config/cmake/binex/Using_CMake.txt
index c289cba0..dafc5f16 100644
--- a/ZFP/config/cmake/binex/Using_CMake.txt
+++ b/ZFP/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/ZFP/config/cmake/binex/config/cmake/HDFMacros.cmake b/ZFP/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/ZFP/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/ZFP/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/ZFP/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst b/ZFP/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst
index 0a1ba90a..5cf68903 100644
--- a/ZFP/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst
+++ b/ZFP/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst
@@ -4,8 +4,8 @@ zfp filter is available for encoding and decoding.
 ....Close the file and reopen for reading ........
 Filter info is available from the dataset creation property
    Filter identifier is 32013
-   Number of parameters is 6 with the value 5570817
-   To find more about the filter check H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+   Number of parameters is 6 with the value 268456208
+   To find more about the filter check H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
 ....Reading zfp compressed data ................
 Maximum value in DS1 is 1890.0000
 zfp filter is available now since H5Dread triggered loading of the filter.
diff --git a/ZFP/docs/installation.rst b/ZFP/docs/installation.rst
index 1967091f..bb8a4dd6 100644
--- a/ZFP/docs/installation.rst
+++ b/ZFP/docs/installation.rst
@@ -79,7 +79,7 @@ Compiling HDF5_
   `ISO_C_BINDING <https://gcc.gnu.org/onlinedocs/gfortran/ISO_005fC_005fBINDING.html>`_
   to define the Fortran interface.
 
-* If you are using HDF5-1.10 and wish to use the filter as a *library* (see :ref:`plugin-vs-library`),
+* If you are using HDF5-1.12 and wish to use the filter as a *library* (see :ref:`plugin-vs-library`),
   you may need configure HDF5 with ``--disable-memory-alloc-sanity-check`` to work
   around a memory management issue in HDF5.
 
diff --git a/ZFP/example/testfiles/ud_mesh_convert.mesh.h5.err b/ZFP/example/testfiles/ud_mesh_convert.mesh.h5.err
index 4da4c879..83b012bc 100644
--- a/ZFP/example/testfiles/ud_mesh_convert.mesh.h5.err
+++ b/ZFP/example/testfiles/ud_mesh_convert.mesh.h5.err
@@ -2,86 +2,104 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+  #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
+    major: Virtual Object Layer
+    minor: Unable to create file
+  #002: (file name) line (number) in H5VL__dataset_create(): dataset create failed
+    major: Virtual Object Layer
+    minor: Unable to create file
+  #003: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #002: (file name) line (number) in H5L_link_object(): unable to create new link to object
+  #004: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #005: (file name) line (number) in H5L_link_object(): unable to create new link to object
     major: Links
     minor: Unable to initialize object
-  #003: (file name) line (number) in H5L__create_real(): can't insert link
+  #006: (file name) line (number) in H5L__create_real(): can't insert link
     major: Links
     minor: Unable to insert object
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #007: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #008: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #006: (file name) line (number) in H5L__link_cb(): unable to create object
+  #009: (file name) line (number) in H5L__link_cb(): unable to create object
     major: Links
     minor: Unable to initialize object
-  #007: (file name) line (number) in H5O_obj_create(): unable to open object
+  #010: (file name) line (number) in H5O_obj_create(): unable to open object
     major: Object header
     minor: Can't open object
-  #008: (file name) line (number) in H5O__dset_create(): unable to create dataset
+  #011: (file name) line (number) in H5O__dset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #009: (file name) line (number) in H5D__create(): I/O filters can't operate on this dataset
+  #012: (file name) line (number) in H5D__create(): I/O filters can't operate on this dataset
     major: Invalid arguments to routine
     minor: Unable to initialize object
-  #010: (file name) line (number) in H5Z_can_apply(): unable to apply filter
+  #013: (file name) line (number) in H5Z_can_apply(): unable to apply filter
     major: Data filters
     minor: Error from filter 'can apply' callback
-  #011: (file name) line (number) in H5Z__prepare_prelude_callback_dcpl(): unable to apply filter
+  #014: (file name) line (number) in H5Z__prepare_prelude_callback_dcpl(): unable to apply filter
     major: Data filters
     minor: Error from filter 'can apply' callback
-  #012: (file name) line (number) in H5Z__prelude_callback(): filter parameters not appropriate
+  #015: (file name) line (number) in H5Z__prelude_callback(): filter parameters not appropriate
     major: Data filters
     minor: Error from filter 'can apply' callback
-  #013: (file name) line (number) in H5Z_zfp_can_apply(): requires datatype size of 4 or 8
+  #016: (file name) line (number) in H5Z_zfp_can_apply(): requires datatype size of 4 or 8
     major: Data filters
     minor: Inappropriate type
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+  #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
+    major: Virtual Object Layer
+    minor: Unable to create file
+  #002: (file name) line (number) in H5VL__dataset_create(): dataset create failed
+    major: Virtual Object Layer
+    minor: Unable to create file
+  #003: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #004: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
     major: Dataset
     minor: Unable to initialize object
-  #002: (file name) line (number) in H5L_link_object(): unable to create new link to object
+  #005: (file name) line (number) in H5L_link_object(): unable to create new link to object
     major: Links
     minor: Unable to initialize object
-  #003: (file name) line (number) in H5L__create_real(): can't insert link
+  #006: (file name) line (number) in H5L__create_real(): can't insert link
     major: Links
     minor: Unable to insert object
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #007: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #008: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #006: (file name) line (number) in H5L__link_cb(): unable to create object
+  #009: (file name) line (number) in H5L__link_cb(): unable to create object
     major: Links
     minor: Unable to initialize object
-  #007: (file name) line (number) in H5O_obj_create(): unable to open object
+  #010: (file name) line (number) in H5O_obj_create(): unable to open object
     major: Object header
     minor: Can't open object
-  #008: (file name) line (number) in H5O__dset_create(): unable to create dataset
+  #011: (file name) line (number) in H5O__dset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #009: (file name) line (number) in H5D__create(): I/O filters can't operate on this dataset
+  #012: (file name) line (number) in H5D__create(): I/O filters can't operate on this dataset
     major: Invalid arguments to routine
     minor: Unable to initialize object
-  #010: (file name) line (number) in H5Z_can_apply(): unable to apply filter
+  #013: (file name) line (number) in H5Z_can_apply(): unable to apply filter
     major: Data filters
     minor: Error from filter 'can apply' callback
-  #011: (file name) line (number) in H5Z__prepare_prelude_callback_dcpl(): unable to apply filter
+  #014: (file name) line (number) in H5Z__prepare_prelude_callback_dcpl(): unable to apply filter
     major: Data filters
     minor: Error from filter 'can apply' callback
-  #012: (file name) line (number) in H5Z__prelude_callback(): filter parameters not appropriate
+  #015: (file name) line (number) in H5Z__prelude_callback(): filter parameters not appropriate
     major: Data filters
     minor: Error from filter 'can apply' callback
-  #013: (file name) line (number) in H5Z_zfp_can_apply(): requires datatype size of 4 or 8
+  #016: (file name) line (number) in H5Z_zfp_can_apply(): requires datatype size of 4 or 8
     major: Data filters
     minor: Inappropriate type
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/ZFP/src/H5Zzfp.c b/ZFP/src/H5Zzfp.c
index 11e588f7..0f951ea5 100644
--- a/ZFP/src/H5Zzfp.c
+++ b/ZFP/src/H5Zzfp.c
@@ -1,4 +1,5 @@
-
+#include <stdlib.h>
+#include <string.h>
 /*
 This code was based heavily on one of the HDF5 library's internal
 filter, H5Zszip.c. The intention in so doing wasn't so much to
@@ -72,7 +73,6 @@ and calls to bitstream methods with 'B ' as in
 #include "H5PLextern.h"
 #include "H5Spublic.h"
 #include "zfp.h"
-#include "bitstream.h"
 #define Z
 #define B
 #endif /* ] AS_SILO_BUILTIN */
@@ -80,14 +80,30 @@ and calls to bitstream methods with 'B ' as in
 #include "H5Zzfp_plugin.h"
 #include "H5Zzfp_props_private.h"
 
-/* Convenient CPP logic to capture ZFP lib version numbers as compile time string and hex number */
+/* Convenient CPP logic to capture ZFP lib version numbers as compile time hex number */
+#define ZFP_VERSION_NO__(Maj,Min,Pat,Twk)  (0x ## Maj ## Min ## Pat ## Twk)
+#define ZFP_VERSION_NO_(Maj,Min,Pat,Twk)   ZFP_VERSION_NO__(Maj,Min,Pat,Twk)
+#if defined(ZFP_VERSION_TWEAK)
+#define ZFP_VERSION_NO                 ZFP_VERSION_NO_(ZFP_VERSION_MAJOR,ZFP_VERSION_MINOR,ZFP_VERSION_PATCH,ZFP_VERSION_TWEAK)
+#elif defined(ZFP_VERSION_RELEASE)
+#define ZFP_VERSION_NO                 ZFP_VERSION_NO_(ZFP_VERSION_MAJOR,ZFP_VERSION_MINOR,ZFP_VERSION_RELEASE,0)
+#elif defined(ZFP_VERSION_PATCH)
+#define ZFP_VERSION_NO                 ZFP_VERSION_NO_(ZFP_VERSION_MAJOR,ZFP_VERSION_MINOR,ZFP_VERSION_PATCH,0)
+#else
+#error ZFP LIBRARY VERSION NOT DETECTED
+#endif
+
+/* Older versions of ZFP don't define this */
+#ifndef ZFP_VERSION_STRING
 #define ZFP_VERSION_STR__(Maj,Min,Rel) #Maj "." #Min "." #Rel
 #define ZFP_VERSION_STR_(Maj,Min,Rel)  ZFP_VERSION_STR__(Maj,Min,Rel)
-#define ZFP_VERSION_STR                ZFP_VERSION_STR_(ZFP_VERSION_MAJOR,ZFP_VERSION_MINOR,ZFP_VERSION_RELEASE)
+#define ZFP_VERSION_STRING             ZFP_VERSION_STR_(ZFP_VERSION_MAJOR,ZFP_VERSION_MINOR,ZFP_VERSION_RELEASE)
+#endif
 
-#define ZFP_VERSION_NO__(Maj,Min,Rel)  (0x0 ## Maj ## Min ## Rel)
-#define ZFP_VERSION_NO_(Maj,Min,Rel)   ZFP_VERSION_NO__(Maj,Min,Rel)
-#define ZFP_VERSION_NO                 ZFP_VERSION_NO_(ZFP_VERSION_MAJOR,ZFP_VERSION_MINOR,ZFP_VERSION_RELEASE)
+/* Older versions of ZFP don't define this publicly */
+#ifndef ZFP_CODEC
+#define ZFP_CODEC ZFP_VERSION_MINOR
+#endif
 
 /* Convenient CPP logic to capture H5Z_ZFP Filter version numbers as string and hex number */
 #define H5Z_FILTER_ZFP_VERSION_STR__(Maj,Min,Pat) #Maj "." #Min "." #Pat
@@ -109,8 +125,8 @@ do                                                    \
 
 static int h5z_zfp_was_registered = 0;
 
-static size_t H5Z_filter_zfp   (unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[],
-                                size_t nbytes, size_t *buf_size, void **buf);
+static size_t H5Z_filter_zfp(unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[],
+                             size_t nbytes, size_t *buf_size, void **buf);
 static htri_t H5Z_zfp_can_apply(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 static herr_t H5Z_zfp_set_local(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 
@@ -126,7 +142,7 @@ const H5Z_class2_t H5Z_ZFP[1] = {{
     1,                      /* decoder_present flag         */
     "H5Z-ZFP"               /* Filter name for debugging    */
     "-" H5Z_FILTER_ZFP_VERSION_STR
-    " (ZFP-" ZFP_VERSION_STR ") "
+    " (ZFP-" ZFP_VERSION_STRING ") "
     "github.com/LLNL/H5Z-ZFP",
     (H5Z_can_apply_func_t)(H5Z_zfp_can_apply),      /* The "can apply" callback     */
     (H5Z_set_local_func_t)(H5Z_zfp_set_local),      /* The "set local" callback     */
@@ -162,11 +178,6 @@ int H5Z_zfp_finalize(void)
     return 1;
 }
 
-static void H5Z_zfp_final(void)
-{
-    H5Z_zfp_finalize();
-}
-
 static htri_t
 H5Z_zfp_can_apply(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
 {
@@ -196,7 +207,7 @@ H5Z_zfp_can_apply(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
         H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADTYPE, -1, "bad chunk data space");
 
     /* confirm ZFP library can handle this data */
-#if ZFP_VERSION_NO < 0x0051
+#if ZFP_VERSION_NO < 0x0510
     if (!(dclass == H5T_FLOAT))
         H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADTYPE, 0,
             "requires datatype class of H5T_FLOAT");
@@ -217,11 +228,12 @@ H5Z_zfp_can_apply(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
         ndims_used++;
     }
 
+#if ZFP_VERSION_NO < 0x0530
     if (ndims_used == 0 || ndims_used > max_ndims)
-#if ZFP_VERSION_NO < 0x0053
         H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADVALUE, 0,
             "chunk must have only 1...3 non-unity dimensions");
 #else
+    if (ndims_used == 0 || ndims_used > max_ndims)
         H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADVALUE, 0,
             "chunk must have only 1...4 non-unity dimensions");
 #endif
@@ -308,16 +320,14 @@ H5Z_zfp_set_local(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
         case 1: dummy_field = Z zfp_field_1d(0, zt, dims_used[0]); break;
         case 2: dummy_field = Z zfp_field_2d(0, zt, dims_used[1], dims_used[0]); break;
         case 3: dummy_field = Z zfp_field_3d(0, zt, dims_used[2], dims_used[1], dims_used[0]); break;
-#if ZFP_VERSION_NO >= 0x0054
+#if ZFP_VERSION_NO >= 0x0540
         case 4: dummy_field = Z zfp_field_4d(0, zt, dims_used[3], dims_used[2], dims_used[1], dims_used[0]); break;
 #endif
         default:
-#if ZFP_VERSION_NO < 0x0053
-            H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADVALUE, 0,
-                     "chunks may have only 1...3 non-unity dims");
+#if ZFP_VERSION_NO < 0x0530
+            H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADVALUE, 0, "chunks may have only 1...3 non-unity dims");
 #else
-            H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADVALUE, 0,
-                     "chunks may have only 1...4 non-unity dims");
+            H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_BADVALUE, 0, "chunks may have only 1...4 non-unity dims");
 #endif
     }
     if (!dummy_field)
@@ -346,7 +356,7 @@ H5Z_zfp_set_local(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
 
     /* Into hdr_cd_values, we encode ZFP library and H5Z-ZFP plugin version info at
        entry 0 and use remaining entries as a tiny buffer to write ZFP native header. */
-    hdr_cd_values[0] = (unsigned int) ((ZFP_VERSION_NO<<16) | H5Z_FILTER_ZFP_VERSION_NO);
+    hdr_cd_values[0] = (unsigned int) ((ZFP_VERSION_NO<<16) | (ZFP_CODEC<<12) | H5Z_FILTER_ZFP_VERSION_NO);
     if (0 == (dummy_bstr = B stream_open(&hdr_cd_values[1], sizeof(hdr_cd_values))))
         H5Z_ZFP_PUSH_AND_GOTO(H5E_RESOURCE, H5E_NOSPACE, 0, "stream_open() failed");
 
@@ -362,14 +372,14 @@ H5Z_zfp_set_local(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
                 Z zfp_stream_set_rate(dummy_zstr, ctrls.details.rate, zt, ndims_used, 0);
                 break;
             case H5Z_ZFP_MODE_PRECISION:
-#if ZFP_VERSION_NO < 0x0051
+#if ZFP_VERSION_NO < 0x0510
                 Z zfp_stream_set_precision(dummy_zstr, ctrls.details.prec, zt);
 #else
                 Z zfp_stream_set_precision(dummy_zstr, ctrls.details.prec);
 #endif
                 break;
             case H5Z_ZFP_MODE_ACCURACY:
-#if ZFP_VERSION_NO < 0x0051
+#if ZFP_VERSION_NO < 0x0510
                 Z zfp_stream_set_accuracy(dummy_zstr, ctrls.details.acc, zt);
 #else
                 Z zfp_stream_set_accuracy(dummy_zstr, ctrls.details.acc);
@@ -380,7 +390,7 @@ H5Z_zfp_set_local(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
                     ctrls.details.expert.maxbits, ctrls.details.expert.maxprec,
                     ctrls.details.expert.minexp);
                 break;
-#if ZFP_VERSION_NO >= 0x0055
+#if ZFP_VERSION_NO >= 0x0550
             case H5Z_ZFP_MODE_REVERSIBLE:
                 Z zfp_stream_set_reversible(dummy_zstr);
                 break;
@@ -397,14 +407,14 @@ H5Z_zfp_set_local(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
                 Z zfp_stream_set_rate(dummy_zstr, *((double*) &mem_cd_values[2]), zt, ndims_used, 0);
                 break;
             case H5Z_ZFP_MODE_PRECISION:
-#if ZFP_VERSION_NO < 0x0051
+#if ZFP_VERSION_NO < 0x0510
                 Z zfp_stream_set_precision(dummy_zstr, mem_cd_values[2], zt);
 #else
                 Z zfp_stream_set_precision(dummy_zstr, mem_cd_values[2]);
 #endif
                 break;
             case H5Z_ZFP_MODE_ACCURACY:
-#if ZFP_VERSION_NO < 0x0051
+#if ZFP_VERSION_NO < 0x0510
                 Z zfp_stream_set_accuracy(dummy_zstr, *((double*) &mem_cd_values[2]), zt);
 #else
                 Z zfp_stream_set_accuracy(dummy_zstr, *((double*) &mem_cd_values[2]));
@@ -414,7 +424,7 @@ H5Z_zfp_set_local(hid_t dcpl_id, hid_t type_id, hid_t chunk_space_id)
                 Z zfp_stream_set_params(dummy_zstr, mem_cd_values[2], mem_cd_values[3],
                     mem_cd_values[4], (int) mem_cd_values[5]);
                 break;
-#if ZFP_VERSION_NO >= 0x0055
+#if ZFP_VERSION_NO >= 0x0550
             case H5Z_ZFP_MODE_REVERSIBLE:
                 Z zfp_stream_set_reversible(dummy_zstr);
                 break;
@@ -529,6 +539,58 @@ get_zfp_info_from_cd_values(size_t cd_nelmts, unsigned int const *cd_values,
     return retval;
 }
 
+/*
+Compare ZFP codec version used when data was written to what is
+currently being used to read the data. There is a challenge here
+in that earlier versions of this filter recorded only the ZFP
+library version, not the codec version. Although ZFP codec version
+was encoded as minor digit of ZFP library version, that convention
+ended with ZFP version 1.0.0. So, if an old version of this filter
+is used with newer ZFP libraries, we won't know the codec version
+used to write the data with certainty. The best we can do is guess
+it. If there becomes a version of the ZFP library for which that guess
+(currently 5) is wrong, the logic here will need to be updated to
+capture knowledge of the ZFP library version for which the codec
+version was incrimented.
+*/
+
+static int
+zfp_codec_version_mismatch(
+    unsigned int h5zfpver_from_cd_val_data_in_file,
+    unsigned int zfpver_from_cd_val_data_in_file,
+    unsigned int zfpcodec_from_cd_val_data_in_file)
+{
+    int writer_codec;
+    int reader_codec;
+
+    if (h5zfpver_from_cd_val_data_in_file < 0x0110)
+    {
+        /* for data written with older versions of the filter,
+           we infer codec from ZFP library version stored in the file. */
+        zfpver_from_cd_val_data_in_file <<= 4;
+        if (zfpver_from_cd_val_data_in_file < 0x0500)
+            writer_codec = 4;
+        else if (zfpver_from_cd_val_data_in_file < 0x1000)
+            writer_codec = (zfpver_from_cd_val_data_in_file & 0x0F00)>>8;
+        else if (zfpver_from_cd_val_data_in_file == 0x1000)
+            writer_codec = 5;
+        else
+            writer_codec = 5; /* can only guess */
+    }
+    else
+        writer_codec = zfpcodec_from_cd_val_data_in_file;
+
+#if ZFP_VERSION_NO < 0x0500
+    reader_codec = 4;
+#elif ZFP_VERSION_NO < 0x1000
+    reader_codec = 5;
+#else
+    reader_codec = ZFP_CODEC;
+#endif
+
+    return writer_codec > reader_codec;
+}
+
 static size_t
 H5Z_filter_zfp(unsigned int flags, size_t cd_nelmts,
     const unsigned int cd_values[], size_t nbytes,
@@ -537,7 +599,9 @@ H5Z_filter_zfp(unsigned int flags, size_t cd_nelmts,
     static char const *_funcname_ = "H5Z_filter_zfp";
     void *newbuf = 0;
     size_t retval = 0;
-    int cd_vals_zfpver = (cd_values[0]>>16)&0x0000FFFF;
+    unsigned int cd_vals_h5zzfpver = cd_values[0]&0x00000FFF;
+    unsigned int cd_vals_zfpcodec = (cd_values[0]>>12)&0x0000000F;
+    unsigned int cd_vals_zfpver = (cd_values[0]>>16)&0x0000FFFF;
     H5T_order_t swap = H5T_ORDER_NONE;
     uint64 zfp_mode, zfp_meta;
     bitstream *bstr = 0;
@@ -553,10 +617,9 @@ H5Z_filter_zfp(unsigned int flags, size_t cd_nelmts,
         int status;
         size_t bsize, dsize;
 
-        /* Worry about zfp version and endian mismatch only for decompression */
-        if (cd_vals_zfpver > ZFP_VERSION)
-            H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_NOSPACE, 0, "ZFP lib version, "
-                ZFP_VERSION_STR ", too old to decompress this data");
+        /* Worry about zfp version mismatch only for decompression */
+        if (zfp_codec_version_mismatch(cd_vals_h5zzfpver, cd_vals_zfpver, cd_vals_zfpcodec))
+            H5Z_ZFP_PUSH_AND_GOTO(H5E_PLINE, H5E_READERROR, 0, "ZFP codec version mismatch");
 
         /* Set up the ZFP field object */
         if (0 == (zfld = Z zfp_field_alloc()))
diff --git a/ZFP/src/H5Zzfp_plugin.h b/ZFP/src/H5Zzfp_plugin.h
index f875dc0a..0e4c9932 100644
--- a/ZFP/src/H5Zzfp_plugin.h
+++ b/ZFP/src/H5Zzfp_plugin.h
@@ -1,23 +1,14 @@
 #ifndef H5Z_ZFP_PLUGIN_H
 #define H5Z_ZFP_PLUGIN_H
 
-/* Filter ID number registered with The HDF Group */
-#define H5Z_FILTER_ZFP 32013
+#include "H5Zzfp_version.h"
 
-#define H5Z_FILTER_ZFP_VERSION_MAJOR 1
-#define H5Z_FILTER_ZFP_VERSION_MINOR 0
-#define H5Z_FILTER_ZFP_VERSION_PATCH 1
+/* HDF5 generic cd_vals[] memory layout (6 unsigned ints) for
+   controlling H5Z-ZFP behavior as a plugin. NOTE: These cd_vals
+   used to pass properties in-memory from caller to filter via HDF5
+   generic interface are NOT THE SAME AS the cd_vals[] that
+   ultimately get stored to the file for the filter "header" data. 
 
-#define H5Z_ZFP_MODE_RATE      1
-#define H5Z_ZFP_MODE_PRECISION 2
-#define H5Z_ZFP_MODE_ACCURACY  3
-#define H5Z_ZFP_MODE_EXPERT    4
-#define H5Z_ZFP_MODE_REVERSIBLE 5
-
-#define H5Z_ZFP_CD_NELMTS_MEM ((size_t) 6) /* used in public API to filter */
-#define H5Z_ZFP_CD_NELMTS_MAX ((size_t) 6) /* max, over all versions, used in dataset header */
-
-/* HDF5 filter cd_vals[] layout (6 unsigned ints)
 cd_vals    0       1        2         3         4         5    
 ----------------------------------------------------------------
 rate:      1    unused    rateA     rateB     unused    unused
@@ -67,10 +58,10 @@ do {                                                    \
     if ((N>=6)&&(CD[0] == H5Z_ZFP_MODE_EXPERT))         \
     {                                                   \
         unsigned int *p; int *q;                        \
-        p = MiB; *p = CD[2];                            \
-        p = MaB; *p = CD[3];                            \
-        p = MaP; *p = CD[4];                            \
-        q = MiE; *q = (int) CD[5];                      \
+        p = &MiB; *p = CD[2];                           \
+        p = &MaB; *p = CD[3];                           \
+        p = &MaP; *p = CD[4];                           \
+        q = &MiE; *q = (int) CD[5];                     \
     }                                                   \
 } while(0)
 
diff --git a/ZFP/src/H5Zzfp_props.c b/ZFP/src/H5Zzfp_props.c
index a07a39ab..372c9d6c 100644
--- a/ZFP/src/H5Zzfp_props.c
+++ b/ZFP/src/H5Zzfp_props.c
@@ -54,14 +54,14 @@ static herr_t H5Pset_zfp(hid_t plist, int mode, ...)
         }
         case H5Z_ZFP_MODE_PRECISION:
         {
-            ctrls_p->details.prec = va_arg(ap, uint);
+            ctrls_p->details.prec = va_arg(ap, unsigned int);
             break;
         }
         case H5Z_ZFP_MODE_EXPERT:
         {
-            ctrls_p->details.expert.minbits = va_arg(ap, uint);
-            ctrls_p->details.expert.maxbits = va_arg(ap, uint);
-            ctrls_p->details.expert.maxprec = va_arg(ap, uint);
+            ctrls_p->details.expert.minbits = va_arg(ap, unsigned int);
+            ctrls_p->details.expert.maxbits = va_arg(ap, unsigned int);
+            ctrls_p->details.expert.maxprec = va_arg(ap, unsigned int);
             ctrls_p->details.expert.minexp  = va_arg(ap, int);
             break;
         }
diff --git a/ZFP/src/H5Zzfp_props.h b/ZFP/src/H5Zzfp_props.h
index 2027571a..c8a3625c 100644
--- a/ZFP/src/H5Zzfp_props.h
+++ b/ZFP/src/H5Zzfp_props.h
@@ -14,6 +14,13 @@ extern herr_t H5Pset_zfp_expert(hid_t plist, unsigned int minbits, unsigned int
     unsigned int maxprec, int minexp); 
 extern herr_t H5Pset_zfp_reversible(hid_t plist); 
 
+extern void H5Pset_zfp_rate_cdata_f(double rate, size_t *cd_nelmts, unsigned int *cd_values);
+extern void H5Pset_zfp_precision_cdata_f(unsigned int prec, size_t *cd_nelmts, unsigned int *cd_values);
+extern void H5Pset_zfp_accuracy_cdata_f(double acc, size_t *cd_nelmts, unsigned int *cd_values);
+extern void H5Pset_zfp_expert_cdata_f(unsigned int minbits, unsigned int maxbits, unsigned int maxprec,
+                                      int minexp, size_t *cd_nelmts, unsigned int *cd_values);
+extern void H5Pset_zfp_reversible_cdata_f(size_t *cd_nelmts, unsigned int *cd_values);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/ZFP/src/H5Zzfp_props_f.F90 b/ZFP/src/H5Zzfp_props_f.F90
index 96ac55b4..962e859e 100644
--- a/ZFP/src/H5Zzfp_props_f.F90
+++ b/ZFP/src/H5Zzfp_props_f.F90
@@ -7,9 +7,9 @@ MODULE H5Zzfp_props_f
   INTEGER :: H5Z_FILTER_ZFP=32013
 
   INTEGER :: H5Z_FILTER_ZFP_VERSION_MAJOR=1
-  INTEGER :: H5Z_FILTER_ZFP_VERSION_MINOR=0
-  INTEGER :: H5Z_FILTER_ZFP_VERSION_PATCH=1
-  
+  INTEGER :: H5Z_FILTER_ZFP_VERSION_MINOR=1
+  INTEGER :: H5Z_FILTER_ZFP_VERSION_PATCH=0
+
   INTEGER(C_SIZE_T), PARAMETER :: H5Z_ZFP_CD_NELMTS_MEM=6  ! used in public API to filter
   INTEGER(C_SIZE_T), PARAMETER :: H5Z_ZFP_CD_NELMTS_MAX=6  ! max, over all versions, used in dataset header
 
@@ -43,7 +43,7 @@ INTEGER(C_INT) FUNCTION H5Pset_zfp_precision(plist, prec) BIND(C, NAME='H5Pset_z
        INTEGER(HID_T), VALUE :: plist
        INTEGER(C_INT), VALUE :: prec
      END FUNCTION H5Pset_zfp_precision
-     
+
      INTEGER(C_INT) FUNCTION H5Pset_zfp_accuracy(plist, acc) BIND(C, NAME='H5Pset_zfp_accuracy')
        IMPORT :: C_INT, C_DOUBLE, HID_T
        IMPLICIT NONE
@@ -67,7 +67,7 @@ INTEGER(C_INT) FUNCTION H5Pset_zfp_reversible(plist) BIND(C, NAME='H5Pset_zfp_re
        IMPLICIT NONE
        INTEGER(HID_T), VALUE :: plist
      END FUNCTION H5Pset_zfp_reversible
-    
+
   END INTERFACE
 
 END MODULE H5Zzfp_props_f
diff --git a/ZFP/src/H5Zzfp_version.h b/ZFP/src/H5Zzfp_version.h
new file mode 100644
index 00000000..9bd327dc
--- /dev/null
+++ b/ZFP/src/H5Zzfp_version.h
@@ -0,0 +1,19 @@
+#ifndef H5Z_ZFP_VERSION_H
+#define H5Z_ZFP_VERSION_H
+
+#define H5Z_FILTER_ZFP 32013
+
+#define H5Z_FILTER_ZFP_VERSION_MAJOR 1
+#define H5Z_FILTER_ZFP_VERSION_MINOR 1
+#define H5Z_FILTER_ZFP_VERSION_PATCH 0
+
+#define H5Z_ZFP_MODE_RATE      1
+#define H5Z_ZFP_MODE_PRECISION 2
+#define H5Z_ZFP_MODE_ACCURACY  3
+#define H5Z_ZFP_MODE_EXPERT    4
+#define H5Z_ZFP_MODE_REVERSIBLE 5
+
+#define H5Z_ZFP_CD_NELMTS_MEM 6
+#define H5Z_ZFP_CD_NELMTS_MAX 6
+
+#endif
diff --git a/ZSTD/CMakeLists.txt b/ZSTD/CMakeLists.txt
index 416270d1..54ee3441 100644
--- a/ZSTD/CMakeLists.txt
+++ b/ZSTD/CMakeLists.txt
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.12)
 project (H5ZSTD C)
 
 if (POLICY CMP0074)
diff --git a/ZSTD/config/cmake/CTestScript.cmake b/ZSTD/config/cmake/CTestScript.cmake
index 03041c22..1e6e40ff 100644
--- a/ZSTD/config/cmake/CTestScript.cmake
+++ b/ZSTD/config/cmake/CTestScript.cmake
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.12)
 ########################################################
 # This dashboard is maintained by The HDF Group
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/ZSTD/config/cmake/H5PL_Examples.cmake.in b/ZSTD/config/cmake/H5PL_Examples.cmake.in
index e6f39754..0441e965 100644
--- a/ZSTD/config/cmake/H5PL_Examples.cmake.in
+++ b/ZSTD/config/cmake/H5PL_Examples.cmake.in
@@ -9,14 +9,14 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.12)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/ZSTD/config/cmake/HDFMacros.cmake b/ZSTD/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/ZSTD/config/cmake/HDFMacros.cmake
+++ b/ZSTD/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/ZSTD/config/cmake/HDFPluginMacros.cmake b/ZSTD/config/cmake/HDFPluginMacros.cmake
index 722d7910..dfd365c5 100644
--- a/ZSTD/config/cmake/HDFPluginMacros.cmake
+++ b/ZSTD/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
diff --git a/ZSTD/config/cmake/README.txt.cmake.in b/ZSTD/config/cmake/README.txt.cmake.in
index 3776b21c..eaf28abe 100644
--- a/ZSTD/config/cmake/README.txt.cmake.in
+++ b/ZSTD/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5ZSTD_PACKAGE_NAME@-@H5ZSTD_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5ZSTD_PACKAGE_NAME@-@H5ZSTD_PACKAGE_VERSION_MAJOR@.@H5ZSTD_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5ZSTD_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5ZSTD_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5ZSTD_PACKAGE_NAME@-@H5ZSTD_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/ZSTD/config/cmake/binex/CMakeLists.txt b/ZSTD/config/cmake/binex/CMakeLists.txt
index 0fade168..417a3a97 100644
--- a/ZSTD/config/cmake/binex/CMakeLists.txt
+++ b/ZSTD/config/cmake/binex/CMakeLists.txt
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.12)
 project (HDFPLExamples C)
 
 #-----------------------------------------------------------------------------
diff --git a/ZSTD/config/cmake/binex/Using_CMake.txt b/ZSTD/config/cmake/binex/Using_CMake.txt
index 9e8a6a9a..dafc5f16 100644
--- a/ZSTD/config/cmake/binex/Using_CMake.txt
+++ b/ZSTD/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.18.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,9 +39,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -48,16 +49,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/ZSTD/config/cmake/binex/config/cmake/HDFMacros.cmake b/ZSTD/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/ZSTD/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/ZSTD/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/ZSTD/config/cmake/binex/config/cmake/grepTest.cmake b/ZSTD/config/cmake/binex/config/cmake/grepTest.cmake
index 7142408e..33738287 100644
--- a/ZSTD/config/cmake/binex/config/cmake/grepTest.cmake
+++ b/ZSTD/config/cmake/binex/config/cmake/grepTest.cmake
@@ -49,7 +49,9 @@ endif ()
 
 if (TEST_ENV_VAR)
   set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
-  message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
+  endif ()
 endif ()
 
 # run the test program, capture the stdout/stderr and the result var
diff --git a/ZSTD/config/cmake/binex/example/CMakeLists.txt b/ZSTD/config/cmake/binex/example/CMakeLists.txt
index 9b068633..d592c961 100644
--- a/ZSTD/config/cmake/binex/example/CMakeLists.txt
+++ b/ZSTD/config/cmake/binex/example/CMakeLists.txt
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.12)
 project (HDFPL_EX)
 
 set (dyn_examples
diff --git a/ZSTD/example/CMakeLists.txt b/ZSTD/example/CMakeLists.txt
index 4dc1f30a..e6526c8d 100644
--- a/ZSTD/example/CMakeLists.txt
+++ b/ZSTD/example/CMakeLists.txt
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.12)
 project (HDF5ZSTD_EX)
 
 set (dyn_examples
diff --git a/ZSTD/src/CMakeLists.txt b/ZSTD/src/CMakeLists.txt
index 7a899fcd..84e7b6ce 100644
--- a/ZSTD/src/CMakeLists.txt
+++ b/ZSTD/src/CMakeLists.txt
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.18)
+cmake_minimum_required (VERSION 3.12)
 project (H5ZSTD_SRC C)
 
 #-----------------------------------------------------------------------------
diff --git a/config/cmake/H5PL_Examples.cmake.in b/config/cmake/H5PL_Examples.cmake.in
index 8601a7e0..d7c74a2c 100644
--- a/config/cmake/H5PL_Examples.cmake.in
+++ b/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/config/cmake/HDFPluginMacros.cmake b/config/cmake/HDFPluginMacros.cmake
index 6cb9e043..4f9917fe 100644
--- a/config/cmake/HDFPluginMacros.cmake
+++ b/config/cmake/HDFPluginMacros.cmake
@@ -381,6 +381,13 @@ macro (INSTALL_SUPPORT varname)
     #-----------------------------------------------------------------------------
     PLUGIN_README_PROPERTIES (${PLUGIN_PACKAGE_NAME})
 
+    #-----------------------------------------------------------------------------
+    # Configure the COPYING.txt file for the windows binary package
+    #-----------------------------------------------------------------------------
+    if (WIN32)
+      configure_file (${CMAKE_SOURCE_DIR}/COPYING ${CMAKE_BINARY_DIR}/COPYING.txt @ONLY)
+    endif ()
+
     #-----------------------------------------------------------------------------
     # Add Document File(s) to CMake Install
     #-----------------------------------------------------------------------------
@@ -432,9 +439,9 @@ macro (INSTALL_SUPPORT varname)
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
       set (CPACK_PACKAGE_VERSION_PATCH "")
-      #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-      set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-      set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+      set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/README.txt")
       set (CPACK_PACKAGE_RELOCATABLE TRUE)
       set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
       if (H5PL_OVERRIDE_VERSION)
@@ -475,7 +482,7 @@ macro (INSTALL_SUPPORT varname)
         endif ()
         #  WiX variables
         set (CPACK_WIX_UNINSTALL "1")
-        set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+        set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt")
 #        set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")
       elseif (APPLE)
         list (APPEND CPACK_GENERATOR "STGZ")
diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in
index 7a9abf83..22f00826 100644
--- a/config/cmake/README.txt.cmake.in
+++ b/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5PL_PACKAGE_NAME@-@H5PL_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5PL_PACKAGE_NAME@-@H5PL_PACKAGE_VERSION_MAJOR@.@H5PL_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -25,9 +25,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5PL_PACKAGE_NAME@-@H5PL_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================
diff --git a/config/cmake/binex/CMakeLists.txt b/config/cmake/binex/CMakeLists.txt
index 2893ca47..70b85778 100644
--- a/config/cmake/binex/CMakeLists.txt
+++ b/config/cmake/binex/CMakeLists.txt
@@ -90,4 +90,7 @@ endif ()
 # ZFP filter
 set (ZFP_AVAILABLE 1)
 
+# ZSTD filter
+set (ZSTD_AVAILABLE 1)
+
 add_subdirectory (example)
diff --git a/config/cmake/binex/Using_CMake.txt b/config/cmake/binex/Using_CMake.txt
index dcddab35..878d7062 100644
--- a/config/cmake/binex/Using_CMake.txt
+++ b/config/cmake/binex/Using_CMake.txt
@@ -38,8 +38,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -49,9 +50,9 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -59,16 +60,16 @@ I. Preconditions
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/config/cmake/binex/config/cmake/HDFMacros.cmake b/config/cmake/binex/config/cmake/HDFMacros.cmake
index e7c418c2..a45be081 100644
--- a/config/cmake/binex/config/cmake/HDFMacros.cmake
+++ b/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/config/cmake/binex/example/CMakeLists.txt b/config/cmake/binex/example/CMakeLists.txt
index 0562d374..1e9cb174 100644
--- a/config/cmake/binex/example/CMakeLists.txt
+++ b/config/cmake/binex/example/CMakeLists.txt
@@ -34,6 +34,9 @@ endif ()
 if (MAFISC_AVAILABLE)
   set (dyn_examples ${dyn_examples} h5ex_d_mafisc)
 endif ()
+if (ZSTD_AVAILABLE)
+  set (extra_examples ${extra_examples} h5ex_d_zstd)
+endif ()
 
 set (extra_examples)
 if (ZFP_AVAILABLE)
diff --git a/config/cmake/binex/example/h5ex_d_sz.c b/config/cmake/binex/example/h5ex_d_sz.c
index 92b877ac..89fb0a29 100644
--- a/config/cmake/binex/example/h5ex_d_sz.c
+++ b/config/cmake/binex/example/h5ex_d_sz.c
@@ -23,6 +23,7 @@
 #include "hdf5.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define FILE            "h5ex_d_sz.h5"
 #define DATASET         "DS1"
@@ -33,7 +34,13 @@
 #define CHUNK0          8
 #define CHUNK1          8
 #define CHUNK2          128
-#define H5Z_FILTER_SZ        32017
+#define H5Z_FILTER_SZ   32017
+#define MAX_CHUNK_SIZE  4294967295 //2^32-1
+#define SZ_FLOAT        0
+#define ABS             0
+#define REL             1
+
+void SZ_errConfigToCdArray(size_t* cd_nelmts, unsigned int cd_values[], int error_bound_mode, double abs_error, double rel_error, double pw_rel_error, double psnr);
 
 int
 main (void)
@@ -48,14 +55,14 @@ main (void)
     char            filter_name[80];
     hsize_t         dims[DIM_SIZE] = {DIM0, DIM1, DIM2},
                     chunk[DIM_SIZE] = {CHUNK0, CHUNK1, CHUNK2};
-    size_t          nelmts = 5;                /* number of elements in cd_values */
+    size_t          nelmts = 9;                /* number of elements in cd_values */
     size_t          nbEle = DIM0*DIM1*DIM2;
-    int             dataType = 0; /* FLOAT */
+    int             dataType = SZ_FLOAT;
     unsigned int    flags;
     unsigned        filter_config;
-    const unsigned int    cd_values[10] = {DIM_SIZE, dataType, DIM2, DIM1, DIM0, 0, 0, 0, 0, 0};
-    unsigned int    values_out[10] = {99, 99, 99, 99, 99, 99, 99, 99, 99, 99};
-    float           wdata[DIM0][DIM1][DIM2],          /* Write buffer */
+    unsigned int    cd_values[9] = {0, 0, 0, 0, 0, 0, 0, 0, 0};//, 0, 0, 0, 0, 0, 0, 0};
+    unsigned int    values_out[16] = {99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99};
+    float           wdata[DIM0*DIM1*DIM2],          /* Write buffer */
                     rdata[DIM0][DIM1][DIM2],          /* Read buffer */
                     max;
     hsize_t         i, j, k;
@@ -64,10 +71,8 @@ main (void)
     /*
      * Initialize data.
      */
-    for (i=0; i<DIM0; i++)
-        for (j=0; j<DIM1; j++)
-            for (k=0; k<DIM2; k++)
-                wdata[i][j][k]= (float)(j * k) - (float)(i);
+    for (i=0; i<nbEle; i++)
+        wdata[i] = (float)i;
 
     /*
      * Create a new file using the default properties.
@@ -89,6 +94,11 @@ main (void)
     dcpl_id = H5Pcreate (H5P_DATASET_CREATE);
     if (dcpl_id < 0) goto done;
 
+    /*
+     * Fill the cd_values array
+     */
+    SZ_errConfigToCdArray(&nelmts, cd_values, REL, 0.001, 0.001, 0, 0);
+
     status = H5Pset_filter (dcpl_id, H5Z_FILTER_SZ, H5Z_FLAG_MANDATORY, nelmts, cd_values);
     if (status < 0) goto done;
 
@@ -124,7 +134,7 @@ main (void)
      * Write the data to the dataset.
      */
     printf ("....Writing SZ compressed data ................\n");
-    status = H5Dwrite (dset_id, H5T_IEEE_F32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata[0]);
+    status = H5Dwrite (dset_id, H5T_IEEE_F32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata);
     if (status < 0) printf ("failed to write data.\n");
 
     /*
@@ -174,7 +184,7 @@ main (void)
     switch (filter_id) {
         case H5Z_FILTER_SZ:
             printf ("%d\n", filter_id);
-            printf ("   Number of parameters is %d with the value %u\n", nelmts, values_out[0]);
+            printf ("   Number of parameters is %zu with the value %u\n", nelmts, values_out[0]);
             printf ("   To find more about the filter check %s\n", filter_name);
             break;
         default:
@@ -225,3 +235,85 @@ main (void)
 
     return ret_value;
 }
+
+void symTransform_8bytes(unsigned char data[8])
+{
+    unsigned char tmp = data[0];
+    data[0] = data[7];
+    data[7] = tmp;
+
+    tmp = data[1];
+    data[1] = data[6];
+    data[6] = tmp;
+
+    tmp = data[2];
+    data[2] = data[5];
+    data[5] = tmp;
+
+    tmp = data[3];
+    data[3] = data[4];
+    data[4] = tmp;
+}
+
+typedef union ldouble
+{
+    double value;
+    unsigned long lvalue;
+    unsigned char byte[8];
+} ldouble;
+
+inline void doubleToBytes(unsigned char *b, double num)
+{
+    ldouble buf;
+    buf.value = num;
+    memcpy(b, buf.byte, 8);
+    int x = 1;
+    char *y = (char*)&x;
+    if(*y==1)
+        symTransform_8bytes(b);
+}
+
+inline int bytesToInt32_bigEndian(unsigned char* bytes)
+{
+    int temp = 0;
+    int res = 0;
+
+    res <<= 8;
+    temp = bytes[0] & 0xff;
+    res |= temp;
+
+    res <<= 8;
+    temp = bytes[1] & 0xff;
+    res |= temp;
+
+    res <<= 8;
+    temp = bytes[2] & 0xff;
+    res |= temp;
+
+    res <<= 8;
+    temp = bytes[3] & 0xff;
+    res |= temp;
+
+    return res;
+}
+
+void SZ_errConfigToCdArray(size_t* cd_nelmts, unsigned int cd_values[], int error_bound_mode, double abs_error, double rel_error, double pw_rel_error, double psnr)
+{
+    int k = 0;
+    cd_values[k++] = error_bound_mode;
+    unsigned char b[8];
+    doubleToBytes(b, abs_error);
+    cd_values[k++] = bytesToInt32_bigEndian(b);
+    cd_values[k++] = bytesToInt32_bigEndian(b+4);
+    doubleToBytes(b, rel_error);
+    cd_values[k++] = bytesToInt32_bigEndian(b);
+    cd_values[k++] = bytesToInt32_bigEndian(b+4);
+    doubleToBytes(b, pw_rel_error);
+    cd_values[k++] = bytesToInt32_bigEndian(b);
+    cd_values[k++] = bytesToInt32_bigEndian(b+4);
+    doubleToBytes(b, psnr);
+    cd_values[k++] = bytesToInt32_bigEndian(b);
+    cd_values[k++] = bytesToInt32_bigEndian(b+4);
+    *cd_nelmts = k;
+}
+
diff --git a/config/cmake/binex/example/testfiles/h5ex_d_sz.ddl b/config/cmake/binex/example/testfiles/h5ex_d_sz.ddl
index f665e214..2c65fe87 100644
--- a/config/cmake/binex/example/testfiles/h5ex_d_sz.ddl
+++ b/config/cmake/binex/example/testfiles/h5ex_d_sz.ddl
@@ -5,13 +5,13 @@ GROUP "/" {
       DATASPACE  SIMPLE { ( 8, 8, 128 ) / ( 8, 8, 128 ) }
       STORAGE_LAYOUT {
          CHUNKED ( 8, 8, 128 )
-         SIZE XXX (17.XXXX:1 COMPRESSION)
+         SIZE XXX (198.XXXX:1 COMPRESSION)
       }
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32017
             COMMENT SZ compressor/decompressor for floating-point data.
-            PARAMS { 3 0 128 8 8 }
+            PARAMS { 3 0 128 8 8 1 1062232653 -755914244 1062232653 -755914244 0 0 0 0 }
          }
       }
       FILLVALUE {
@@ -21,662 +21,6 @@ GROUP "/" {
       ALLOCATION_TIME {
          H5D_ALLOC_TIME_INCR
       }
-      DATA {
-      (0,0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      (0,0,21): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      (0,0,41): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      (0,0,61): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      (0,0,81): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      (0,0,101): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      (0,0,121): 0, 0, 0, 0, 0, 0, 0,
-      (0,1,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-      (0,1,18): 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
-      (0,1,33): 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-      (0,1,48): 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
-      (0,1,63): 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-      (0,1,78): 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
-      (0,1,93): 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
-      (0,1,106): 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
-      (0,1,118): 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-      (0,2,0): 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32,
-      (0,2,17): 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62,
-      (0,2,32): 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92,
-      (0,2,47): 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118,
-      (0,2,60): 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 142,
-      (0,2,72): 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164, 166,
-      (0,2,84): 168, 170, 172, 174, 176, 178, 180, 182, 184, 186, 188, 190,
-      (0,2,96): 192, 194, 196, 198, 200, 202, 204, 206, 208, 210, 212, 214,
-      (0,2,108): 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, 236, 238,
-      (0,2,120): 240, 242, 244, 246, 248, 250, 252, 254,
-      (0,3,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45,
-      (0,3,16): 48, 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84, 87, 90,
-      (0,3,31): 93, 96, 99, 102, 105, 108, 111, 114, 117, 120, 123, 126, 129,
-      (0,3,44): 132, 135, 138, 141, 144, 147, 150, 153, 156, 159, 162, 165,
-      (0,3,56): 168, 171, 174, 177, 180, 183, 186, 189, 192, 195, 198, 201,
-      (0,3,68): 204, 207, 210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
-      (0,3,80): 240, 243, 246, 249, 252, 255, 258, 261, 264, 267, 270, 273,
-      (0,3,92): 276, 279, 282, 285, 288, 291, 294, 297, 300, 303, 306, 309,
-      (0,3,104): 312, 315, 318, 321, 324, 327, 330, 333, 336, 339, 342, 345,
-      (0,3,116): 348, 351, 354, 357, 360, 363, 366, 369, 372, 375, 378, 381,
-      (0,4,0): 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60,
-      (0,4,16): 64, 68, 72, 76, 80, 84, 88, 92, 96, 100, 104, 108, 112, 116,
-      (0,4,30): 120, 124, 128, 132, 136, 140, 144, 148, 152, 156, 160, 164,
-      (0,4,42): 168, 172, 176, 180, 184, 188, 192, 196, 200, 204, 208, 212,
-      (0,4,54): 216, 220, 224, 228, 232, 236, 240, 244, 248, 252, 256, 260,
-      (0,4,66): 264, 268, 272, 276, 280, 284, 288, 292, 296, 300, 304, 308,
-      (0,4,78): 312, 316, 320, 324, 328, 332, 336, 340, 344, 348, 352, 356,
-      (0,4,90): 360, 364, 368, 372, 376, 380, 384, 388, 392, 396, 400, 404,
-      (0,4,102): 408, 412, 416, 420, 424, 428, 432, 436, 440, 444, 448, 452,
-      (0,4,114): 456, 460, 464, 468, 472, 476, 480, 484, 488, 492, 496, 500,
-      (0,4,126): 504, 508,
-      (0,5,0): 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75,
-      (0,5,16): 80, 85, 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, 140,
-      (0,5,29): 145, 150, 155, 160, 165, 170, 175, 180, 185, 190, 195, 200,
-      (0,5,41): 205, 210, 215, 220, 225, 230, 235, 240, 245, 250, 255, 260,
-      (0,5,53): 265, 270, 275, 280, 285, 290, 295, 300, 305, 310, 315, 320,
-      (0,5,65): 325, 330, 335, 340, 345, 350, 355, 360, 365, 370, 375, 380,
-      (0,5,77): 385, 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, 440,
-      (0,5,89): 445, 450, 455, 460, 465, 470, 475, 480, 485, 490, 495, 500,
-      (0,5,101): 505, 510, 515, 520, 525, 530, 535, 540, 545, 550, 555, 560,
-      (0,5,113): 565, 570, 575, 580, 585, 590, 595, 600, 605, 610, 615, 620,
-      (0,5,125): 625, 630, 635,
-      (0,6,0): 0, 6, 12, 18, 24, 30, 36, 42, 48, 54, 60, 66, 72, 78, 84, 90,
-      (0,6,16): 96, 102, 108, 114, 120, 126, 132, 138, 144, 150, 156, 162,
-      (0,6,28): 168, 174, 180, 186, 192, 198, 204, 210, 216, 222, 228, 234,
-      (0,6,40): 240, 246, 252, 258, 264, 270, 276, 282, 288, 294, 300, 306,
-      (0,6,52): 312, 318, 324, 330, 336, 342, 348, 354, 360, 366, 372, 378,
-      (0,6,64): 384, 390, 396, 402, 408, 414, 420, 426, 432, 438, 444, 450,
-      (0,6,76): 456, 462, 468, 474, 480, 486, 492, 498, 504, 510, 516, 522,
-      (0,6,88): 528, 534, 540, 546, 552, 558, 564, 570, 576, 582, 588, 594,
-      (0,6,100): 600, 606, 612, 618, 624, 630, 636, 642, 648, 654, 660, 666,
-      (0,6,112): 672, 678, 684, 690, 696, 702, 708, 714, 720, 726, 732, 738,
-      (0,6,124): 744, 750, 756, 762,
-      (0,7,0): 0, 7, 14, 21, 28, 35, 42, 49, 56, 63, 70, 77, 84, 91, 98, 105,
-      (0,7,16): 112, 119, 126, 133, 140, 147, 154, 161, 168, 175, 182, 189,
-      (0,7,28): 196, 203, 210, 217, 224, 231, 238, 245, 252, 259, 266, 273,
-      (0,7,40): 280, 287, 294, 301, 308, 315, 322, 329, 336, 343, 350, 357,
-      (0,7,52): 364, 371, 378, 385, 392, 399, 406, 413, 420, 427, 434, 441,
-      (0,7,64): 448, 455, 462, 469, 476, 483, 490, 497, 504, 511, 518, 525,
-      (0,7,76): 532, 539, 546, 553, 560, 567, 574, 581, 588, 595, 602, 609,
-      (0,7,88): 616, 623, 630, 637, 644, 651, 658, 665, 672, 679, 686, 693,
-      (0,7,100): 700, 707, 714, 721, 728, 735, 742, 749, 756, 763, 770, 777,
-      (0,7,112): 784, 791, 798, 805, 812, 819, 826, 833, 840, 847, 854, 861,
-      (0,7,124): 868, 875, 882, 889,
-      (1,0,0): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,15): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,30): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,45): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,60): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,75): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,90): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,105): -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,0,120): -1, -1, -1, -1, -1, -1, -1, -1,
-      (1,1,0): -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-      (1,1,18): 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-      (1,1,33): 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
-      (1,1,48): 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
-      (1,1,63): 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-      (1,1,78): 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-      (1,1,93): 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
-      (1,1,107): 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
-      (1,1,119): 118, 119, 120, 121, 122, 123, 124, 125, 126,
-      (1,2,0): -1, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31,
-      (1,2,17): 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61,
-      (1,2,32): 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91,
-      (1,2,47): 93, 95, 97, 99, 101, 103, 105, 107, 109, 111, 113, 115, 117,
-      (1,2,60): 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, 139, 141,
-      (1,2,72): 143, 145, 147, 149, 151, 153, 155, 157, 159, 161, 163, 165,
-      (1,2,84): 167, 169, 171, 173, 175, 177, 179, 181, 183, 185, 187, 189,
-      (1,2,96): 191, 193, 195, 197, 199, 201, 203, 205, 207, 209, 211, 213,
-      (1,2,108): 215, 217, 219, 221, 223, 225, 227, 229, 231, 233, 235, 237,
-      (1,2,120): 239, 241, 243, 245, 247, 249, 251, 253,
-      (1,3,0): -1, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41, 44,
-      (1,3,16): 47, 50, 53, 56, 59, 62, 65, 68, 71, 74, 77, 80, 83, 86, 89,
-      (1,3,31): 92, 95, 98, 101, 104, 107, 110, 113, 116, 119, 122, 125, 128,
-      (1,3,44): 131, 134, 137, 140, 143, 146, 149, 152, 155, 158, 161, 164,
-      (1,3,56): 167, 170, 173, 176, 179, 182, 185, 188, 191, 194, 197, 200,
-      (1,3,68): 203, 206, 209, 212, 215, 218, 221, 224, 227, 230, 233, 236,
-      (1,3,80): 239, 242, 245, 248, 251, 254, 257, 260, 263, 266, 269, 272,
-      (1,3,92): 275, 278, 281, 284, 287, 290, 293, 296, 299, 302, 305, 308,
-      (1,3,104): 311, 314, 317, 320, 323, 326, 329, 332, 335, 338, 341, 344,
-      (1,3,116): 347, 350, 353, 356, 359, 362, 365, 368, 371, 374, 377, 380,
-      (1,4,0): -1, 3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59,
-      (1,4,16): 63, 67, 71, 75, 79, 83, 87, 91, 95, 99, 103, 107, 111, 115,
-      (1,4,30): 119, 123, 127, 131, 135, 139, 143, 147, 151, 155, 159, 163,
-      (1,4,42): 167, 171, 175, 179, 183, 187, 191, 195, 199, 203, 207, 211,
-      (1,4,54): 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, 255, 259,
-      (1,4,66): 263, 267, 271, 275, 279, 283, 287, 291, 295, 299, 303, 307,
-      (1,4,78): 311, 315, 319, 323, 327, 331, 335, 339, 343, 347, 351, 355,
-      (1,4,90): 359, 363, 367, 371, 375, 379, 383, 387, 391, 395, 399, 403,
-      (1,4,102): 407, 411, 415, 419, 423, 427, 431, 435, 439, 443, 447, 451,
-      (1,4,114): 455, 459, 463, 467, 471, 475, 479, 483, 487, 491, 495, 499,
-      (1,4,126): 503, 507,
-      (1,5,0): -1, 4, 9, 14, 19, 24, 29, 34, 39, 44, 49, 54, 59, 64, 69, 74,
-      (1,5,16): 79, 84, 89, 94, 99, 104, 109, 114, 119, 124, 129, 134, 139,
-      (1,5,29): 144, 149, 154, 159, 164, 169, 174, 179, 184, 189, 194, 199,
-      (1,5,41): 204, 209, 214, 219, 224, 229, 234, 239, 244, 249, 254, 259,
-      (1,5,53): 264, 269, 274, 279, 284, 289, 294, 299, 304, 309, 314, 319,
-      (1,5,65): 324, 329, 334, 339, 344, 349, 354, 359, 364, 369, 374, 379,
-      (1,5,77): 384, 389, 394, 399, 404, 409, 414, 419, 424, 429, 434, 439,
-      (1,5,89): 444, 449, 454, 459, 464, 469, 474, 479, 484, 489, 494, 499,
-      (1,5,101): 504, 509, 514, 519, 524, 529, 534, 539, 544, 549, 554, 559,
-      (1,5,113): 564, 569, 574, 579, 584, 589, 594, 599, 604, 609, 614, 619,
-      (1,5,125): 624, 629, 634,
-      (1,6,0): -1, 5, 11, 17, 23, 29, 35, 41, 47, 53, 59, 65, 71, 77, 83, 89,
-      (1,6,16): 95, 101, 107, 113, 119, 125, 131, 137, 143, 149, 155, 161,
-      (1,6,28): 167, 173, 179, 185, 191, 197, 203, 209, 215, 221, 227, 233,
-      (1,6,40): 239, 245, 251, 257, 263, 269, 275, 281, 287, 293, 299, 305,
-      (1,6,52): 311, 317, 323, 329, 335, 341, 347, 353, 359, 365, 371, 377,
-      (1,6,64): 383, 389, 395, 401, 407, 413, 419, 425, 431, 437, 443, 449,
-      (1,6,76): 455, 461, 467, 473, 479, 485, 491, 497, 503, 509, 515, 521,
-      (1,6,88): 527, 533, 539, 545, 551, 557, 563, 569, 575, 581, 587, 593,
-      (1,6,100): 599, 605, 611, 617, 623, 629, 635, 641, 647, 653, 659, 665,
-      (1,6,112): 671, 677, 683, 689, 695, 701, 707, 713, 719, 725, 731, 737,
-      (1,6,124): 743, 749, 755, 761,
-      (1,7,0): -1, 6, 13, 20, 27, 34, 41, 48, 55, 62, 69, 76, 83, 90, 97,
-      (1,7,15): 104, 111, 118, 125, 132, 139, 146, 153, 160, 167, 174, 181,
-      (1,7,27): 188, 195, 202, 209, 216, 223, 230, 237, 244, 251, 258, 265,
-      (1,7,39): 272, 279, 286, 293, 300, 307, 314, 321, 328, 335, 342, 349,
-      (1,7,51): 356, 363, 370, 377, 384, 391, 398, 405, 412, 419, 426, 433,
-      (1,7,63): 440, 447, 454, 461, 468, 475, 482, 489, 496, 503, 510, 517,
-      (1,7,75): 524, 531, 538, 545, 552, 559, 566, 573, 580, 587, 594, 601,
-      (1,7,87): 608, 615, 622, 629, 636, 643, 650, 657, 664, 671, 678, 685,
-      (1,7,99): 692, 699, 706, 713, 720, 727, 734, 741, 748, 755, 762, 769,
-      (1,7,111): 776, 783, 790, 797, 804, 811, 818, 825, 832, 839, 846, 853,
-      (1,7,123): 860, 867, 874, 881, 888,
-      (2,0,0): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,15): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,30): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,45): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,60): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,75): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,90): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,105): -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,0,120): -2, -2, -2, -2, -2, -2, -2, -2,
-      (2,1,0): -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-      (2,1,18): 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-      (2,1,33): 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
-      (2,1,48): 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
-      (2,1,63): 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
-      (2,1,78): 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
-      (2,1,93): 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
-      (2,1,107): 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
-      (2,1,119): 117, 118, 119, 120, 121, 122, 123, 124, 125,
-      (2,2,0): -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30,
-      (2,2,17): 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60,
-      (2,2,32): 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90,
-      (2,2,47): 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116,
-      (2,2,60): 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140,
-      (2,2,72): 142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164,
-      (2,2,84): 166, 168, 170, 172, 174, 176, 178, 180, 182, 184, 186, 188,
-      (2,2,96): 190, 192, 194, 196, 198, 200, 202, 204, 206, 208, 210, 212,
-      (2,2,108): 214, 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, 236,
-      (2,2,120): 238, 240, 242, 244, 246, 248, 250, 252,
-      (2,3,0): -2, 1, 4, 7, 10, 13, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43,
-      (2,3,16): 46, 49, 52, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88,
-      (2,3,31): 91, 94, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124, 127,
-      (2,3,44): 130, 133, 136, 139, 142, 145, 148, 151, 154, 157, 160, 163,
-      (2,3,56): 166, 169, 172, 175, 178, 181, 184, 187, 190, 193, 196, 199,
-      (2,3,68): 202, 205, 208, 211, 214, 217, 220, 223, 226, 229, 232, 235,
-      (2,3,80): 238, 241, 244, 247, 250, 253, 256, 259, 262, 265, 268, 271,
-      (2,3,92): 274, 277, 280, 283, 286, 289, 292, 295, 298, 301, 304, 307,
-      (2,3,104): 310, 313, 316, 319, 322, 325, 328, 331, 334, 337, 340, 343,
-      (2,3,116): 346, 349, 352, 355, 358, 361, 364, 367, 370, 373, 376, 379,
-      (2,4,0): -2, 2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54, 58,
-      (2,4,16): 62, 66, 70, 74, 78, 82, 86, 90, 94, 98, 102, 106, 110, 114,
-      (2,4,30): 118, 122, 126, 130, 134, 138, 142, 146, 150, 154, 158, 162,
-      (2,4,42): 166, 170, 174, 178, 182, 186, 190, 194, 198, 202, 206, 210,
-      (2,4,54): 214, 218, 222, 226, 230, 234, 238, 242, 246, 250, 254, 258,
-      (2,4,66): 262, 266, 270, 274, 278, 282, 286, 290, 294, 298, 302, 306,
-      (2,4,78): 310, 314, 318, 322, 326, 330, 334, 338, 342, 346, 350, 354,
-      (2,4,90): 358, 362, 366, 370, 374, 378, 382, 386, 390, 394, 398, 402,
-      (2,4,102): 406, 410, 414, 418, 422, 426, 430, 434, 438, 442, 446, 450,
-      (2,4,114): 454, 458, 462, 466, 470, 474, 478, 482, 486, 490, 494, 498,
-      (2,4,126): 502, 506,
-      (2,5,0): -2, 3, 8, 13, 18, 23, 28, 33, 38, 43, 48, 53, 58, 63, 68, 73,
-      (2,5,16): 78, 83, 88, 93, 98, 103, 108, 113, 118, 123, 128, 133, 138,
-      (2,5,29): 143, 148, 153, 158, 163, 168, 173, 178, 183, 188, 193, 198,
-      (2,5,41): 203, 208, 213, 218, 223, 228, 233, 238, 243, 248, 253, 258,
-      (2,5,53): 263, 268, 273, 278, 283, 288, 293, 298, 303, 308, 313, 318,
-      (2,5,65): 323, 328, 333, 338, 343, 348, 353, 358, 363, 368, 373, 378,
-      (2,5,77): 383, 388, 393, 398, 403, 408, 413, 418, 423, 428, 433, 438,
-      (2,5,89): 443, 448, 453, 458, 463, 468, 473, 478, 483, 488, 493, 498,
-      (2,5,101): 503, 508, 513, 518, 523, 528, 533, 538, 543, 548, 553, 558,
-      (2,5,113): 563, 568, 573, 578, 583, 588, 593, 598, 603, 608, 613, 618,
-      (2,5,125): 623, 628, 633,
-      (2,6,0): -2, 4, 10, 16, 22, 28, 34, 40, 46, 52, 58, 64, 70, 76, 82, 88,
-      (2,6,16): 94, 100, 106, 112, 118, 124, 130, 136, 142, 148, 154, 160,
-      (2,6,28): 166, 172, 178, 184, 190, 196, 202, 208, 214, 220, 226, 232,
-      (2,6,40): 238, 244, 250, 256, 262, 268, 274, 280, 286, 292, 298, 304,
-      (2,6,52): 310, 316, 322, 328, 334, 340, 346, 352, 358, 364, 370, 376,
-      (2,6,64): 382, 388, 394, 400, 406, 412, 418, 424, 430, 436, 442, 448,
-      (2,6,76): 454, 460, 466, 472, 478, 484, 490, 496, 502, 508, 514, 520,
-      (2,6,88): 526, 532, 538, 544, 550, 556, 562, 568, 574, 580, 586, 592,
-      (2,6,100): 598, 604, 610, 616, 622, 628, 634, 640, 646, 652, 658, 664,
-      (2,6,112): 670, 676, 682, 688, 694, 700, 706, 712, 718, 724, 730, 736,
-      (2,6,124): 742, 748, 754, 760,
-      (2,7,0): -2, 5, 12, 19, 26, 33, 40, 47, 54, 61, 68, 75, 82, 89, 96,
-      (2,7,15): 103, 110, 117, 124, 131, 138, 145, 152, 159, 166, 173, 180,
-      (2,7,27): 187, 194, 201, 208, 215, 222, 229, 236, 243, 250, 257, 264,
-      (2,7,39): 271, 278, 285, 292, 299, 306, 313, 320, 327, 334, 341, 348,
-      (2,7,51): 355, 362, 369, 376, 383, 390, 397, 404, 411, 418, 425, 432,
-      (2,7,63): 439, 446, 453, 460, 467, 474, 481, 488, 495, 502, 509, 516,
-      (2,7,75): 523, 530, 537, 544, 551, 558, 565, 572, 579, 586, 593, 600,
-      (2,7,87): 607, 614, 621, 628, 635, 642, 649, 656, 663, 670, 677, 684,
-      (2,7,99): 691, 698, 705, 712, 719, 726, 733, 740, 747, 754, 761, 768,
-      (2,7,111): 775, 782, 789, 796, 803, 810, 817, 824, 831, 838, 845, 852,
-      (2,7,123): 859, 866, 873, 880, 887,
-      (3,0,0): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,15): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,30): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,45): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,60): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,75): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,90): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,105): -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,0,120): -3, -3, -3, -3, -3, -3, -3, -3,
-      (3,1,0): -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-      (3,1,18): 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-      (3,1,33): 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
-      (3,1,48): 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-      (3,1,63): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
-      (3,1,78): 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
-      (3,1,93): 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
-      (3,1,107): 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
-      (3,1,119): 116, 117, 118, 119, 120, 121, 122, 123, 124,
-      (3,2,0): -3, -1, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29,
-      (3,2,17): 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59,
-      (3,2,32): 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89,
-      (3,2,47): 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111, 113, 115,
-      (3,2,60): 117, 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, 139,
-      (3,2,72): 141, 143, 145, 147, 149, 151, 153, 155, 157, 159, 161, 163,
-      (3,2,84): 165, 167, 169, 171, 173, 175, 177, 179, 181, 183, 185, 187,
-      (3,2,96): 189, 191, 193, 195, 197, 199, 201, 203, 205, 207, 209, 211,
-      (3,2,108): 213, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233, 235,
-      (3,2,120): 237, 239, 241, 243, 245, 247, 249, 251,
-      (3,3,0): -3, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42,
-      (3,3,16): 45, 48, 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
-      (3,3,31): 90, 93, 96, 99, 102, 105, 108, 111, 114, 117, 120, 123, 126,
-      (3,3,44): 129, 132, 135, 138, 141, 144, 147, 150, 153, 156, 159, 162,
-      (3,3,56): 165, 168, 171, 174, 177, 180, 183, 186, 189, 192, 195, 198,
-      (3,3,68): 201, 204, 207, 210, 213, 216, 219, 222, 225, 228, 231, 234,
-      (3,3,80): 237, 240, 243, 246, 249, 252, 255, 258, 261, 264, 267, 270,
-      (3,3,92): 273, 276, 279, 282, 285, 288, 291, 294, 297, 300, 303, 306,
-      (3,3,104): 309, 312, 315, 318, 321, 324, 327, 330, 333, 336, 339, 342,
-      (3,3,116): 345, 348, 351, 354, 357, 360, 363, 366, 369, 372, 375, 378,
-      (3,4,0): -3, 1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57,
-      (3,4,16): 61, 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113,
-      (3,4,30): 117, 121, 125, 129, 133, 137, 141, 145, 149, 153, 157, 161,
-      (3,4,42): 165, 169, 173, 177, 181, 185, 189, 193, 197, 201, 205, 209,
-      (3,4,54): 213, 217, 221, 225, 229, 233, 237, 241, 245, 249, 253, 257,
-      (3,4,66): 261, 265, 269, 273, 277, 281, 285, 289, 293, 297, 301, 305,
-      (3,4,78): 309, 313, 317, 321, 325, 329, 333, 337, 341, 345, 349, 353,
-      (3,4,90): 357, 361, 365, 369, 373, 377, 381, 385, 389, 393, 397, 401,
-      (3,4,102): 405, 409, 413, 417, 421, 425, 429, 433, 437, 441, 445, 449,
-      (3,4,114): 453, 457, 461, 465, 469, 473, 477, 481, 485, 489, 493, 497,
-      (3,4,126): 501, 505,
-      (3,5,0): -3, 2, 7, 12, 17, 22, 27, 32, 37, 42, 47, 52, 57, 62, 67, 72,
-      (3,5,16): 77, 82, 87, 92, 97, 102, 107, 112, 117, 122, 127, 132, 137,
-      (3,5,29): 142, 147, 152, 157, 162, 167, 172, 177, 182, 187, 192, 197,
-      (3,5,41): 202, 207, 212, 217, 222, 227, 232, 237, 242, 247, 252, 257,
-      (3,5,53): 262, 267, 272, 277, 282, 287, 292, 297, 302, 307, 312, 317,
-      (3,5,65): 322, 327, 332, 337, 342, 347, 352, 357, 362, 367, 372, 377,
-      (3,5,77): 382, 387, 392, 397, 402, 407, 412, 417, 422, 427, 432, 437,
-      (3,5,89): 442, 447, 452, 457, 462, 467, 472, 477, 482, 487, 492, 497,
-      (3,5,101): 502, 507, 512, 517, 522, 527, 532, 537, 542, 547, 552, 557,
-      (3,5,113): 562, 567, 572, 577, 582, 587, 592, 597, 602, 607, 612, 617,
-      (3,5,125): 622, 627, 632,
-      (3,6,0): -3, 3, 9, 15, 21, 27, 33, 39, 45, 51, 57, 63, 69, 75, 81, 87,
-      (3,6,16): 93, 99, 105, 111, 117, 123, 129, 135, 141, 147, 153, 159,
-      (3,6,28): 165, 171, 177, 183, 189, 195, 201, 207, 213, 219, 225, 231,
-      (3,6,40): 237, 243, 249, 255, 261, 267, 273, 279, 285, 291, 297, 303,
-      (3,6,52): 309, 315, 321, 327, 333, 339, 345, 351, 357, 363, 369, 375,
-      (3,6,64): 381, 387, 393, 399, 405, 411, 417, 423, 429, 435, 441, 447,
-      (3,6,76): 453, 459, 465, 471, 477, 483, 489, 495, 501, 507, 513, 519,
-      (3,6,88): 525, 531, 537, 543, 549, 555, 561, 567, 573, 579, 585, 591,
-      (3,6,100): 597, 603, 609, 615, 621, 627, 633, 639, 645, 651, 657, 663,
-      (3,6,112): 669, 675, 681, 687, 693, 699, 705, 711, 717, 723, 729, 735,
-      (3,6,124): 741, 747, 753, 759,
-      (3,7,0): -3, 4, 11, 18, 25, 32, 39, 46, 53, 60, 67, 74, 81, 88, 95,
-      (3,7,15): 102, 109, 116, 123, 130, 137, 144, 151, 158, 165, 172, 179,
-      (3,7,27): 186, 193, 200, 207, 214, 221, 228, 235, 242, 249, 256, 263,
-      (3,7,39): 270, 277, 284, 291, 298, 305, 312, 319, 326, 333, 340, 347,
-      (3,7,51): 354, 361, 368, 375, 382, 389, 396, 403, 410, 417, 424, 431,
-      (3,7,63): 438, 445, 452, 459, 466, 473, 480, 487, 494, 501, 508, 515,
-      (3,7,75): 522, 529, 536, 543, 550, 557, 564, 571, 578, 585, 592, 599,
-      (3,7,87): 606, 613, 620, 627, 634, 641, 648, 655, 662, 669, 676, 683,
-      (3,7,99): 690, 697, 704, 711, 718, 725, 732, 739, 746, 753, 760, 767,
-      (3,7,111): 774, 781, 788, 795, 802, 809, 816, 823, 830, 837, 844, 851,
-      (3,7,123): 858, 865, 872, 879, 886,
-      (4,0,0): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,15): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,30): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,45): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,60): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,75): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,90): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,105): -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,0,120): -4, -4, -4, -4, -4, -4, -4, -4,
-      (4,1,0): -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-      (4,1,18): 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-      (4,1,33): 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
-      (4,1,48): 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
-      (4,1,63): 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-      (4,1,78): 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
-      (4,1,93): 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
-      (4,1,107): 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
-      (4,1,119): 115, 116, 117, 118, 119, 120, 121, 122, 123,
-      (4,2,0): -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28,
-      (4,2,17): 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58,
-      (4,2,32): 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88,
-      (4,2,47): 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114,
-      (4,2,60): 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138,
-      (4,2,72): 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162,
-      (4,2,84): 164, 166, 168, 170, 172, 174, 176, 178, 180, 182, 184, 186,
-      (4,2,96): 188, 190, 192, 194, 196, 198, 200, 202, 204, 206, 208, 210,
-      (4,2,108): 212, 214, 216, 218, 220, 222, 224, 226, 228, 230, 232, 234,
-      (4,2,120): 236, 238, 240, 242, 244, 246, 248, 250,
-      (4,3,0): -4, -1, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41,
-      (4,3,16): 44, 47, 50, 53, 56, 59, 62, 65, 68, 71, 74, 77, 80, 83, 86,
-      (4,3,31): 89, 92, 95, 98, 101, 104, 107, 110, 113, 116, 119, 122, 125,
-      (4,3,44): 128, 131, 134, 137, 140, 143, 146, 149, 152, 155, 158, 161,
-      (4,3,56): 164, 167, 170, 173, 176, 179, 182, 185, 188, 191, 194, 197,
-      (4,3,68): 200, 203, 206, 209, 212, 215, 218, 221, 224, 227, 230, 233,
-      (4,3,80): 236, 239, 242, 245, 248, 251, 254, 257, 260, 263, 266, 269,
-      (4,3,92): 272, 275, 278, 281, 284, 287, 290, 293, 296, 299, 302, 305,
-      (4,3,104): 308, 311, 314, 317, 320, 323, 326, 329, 332, 335, 338, 341,
-      (4,3,116): 344, 347, 350, 353, 356, 359, 362, 365, 368, 371, 374, 377,
-      (4,4,0): -4, 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56,
-      (4,4,16): 60, 64, 68, 72, 76, 80, 84, 88, 92, 96, 100, 104, 108, 112,
-      (4,4,30): 116, 120, 124, 128, 132, 136, 140, 144, 148, 152, 156, 160,
-      (4,4,42): 164, 168, 172, 176, 180, 184, 188, 192, 196, 200, 204, 208,
-      (4,4,54): 212, 216, 220, 224, 228, 232, 236, 240, 244, 248, 252, 256,
-      (4,4,66): 260, 264, 268, 272, 276, 280, 284, 288, 292, 296, 300, 304,
-      (4,4,78): 308, 312, 316, 320, 324, 328, 332, 336, 340, 344, 348, 352,
-      (4,4,90): 356, 360, 364, 368, 372, 376, 380, 384, 388, 392, 396, 400,
-      (4,4,102): 404, 408, 412, 416, 420, 424, 428, 432, 436, 440, 444, 448,
-      (4,4,114): 452, 456, 460, 464, 468, 472, 476, 480, 484, 488, 492, 496,
-      (4,4,126): 500, 504,
-      (4,5,0): -4, 1, 6, 11, 16, 21, 26, 31, 36, 41, 46, 51, 56, 61, 66, 71,
-      (4,5,16): 76, 81, 86, 91, 96, 101, 106, 111, 116, 121, 126, 131, 136,
-      (4,5,29): 141, 146, 151, 156, 161, 166, 171, 176, 181, 186, 191, 196,
-      (4,5,41): 201, 206, 211, 216, 221, 226, 231, 236, 241, 246, 251, 256,
-      (4,5,53): 261, 266, 271, 276, 281, 286, 291, 296, 301, 306, 311, 316,
-      (4,5,65): 321, 326, 331, 336, 341, 346, 351, 356, 361, 366, 371, 376,
-      (4,5,77): 381, 386, 391, 396, 401, 406, 411, 416, 421, 426, 431, 436,
-      (4,5,89): 441, 446, 451, 456, 461, 466, 471, 476, 481, 486, 491, 496,
-      (4,5,101): 501, 506, 511, 516, 521, 526, 531, 536, 541, 546, 551, 556,
-      (4,5,113): 561, 566, 571, 576, 581, 586, 591, 596, 601, 606, 611, 616,
-      (4,5,125): 621, 626, 631,
-      (4,6,0): -4, 2, 8, 14, 20, 26, 32, 38, 44, 50, 56, 62, 68, 74, 80, 86,
-      (4,6,16): 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158,
-      (4,6,28): 164, 170, 176, 182, 188, 194, 200, 206, 212, 218, 224, 230,
-      (4,6,40): 236, 242, 248, 254, 260, 266, 272, 278, 284, 290, 296, 302,
-      (4,6,52): 308, 314, 320, 326, 332, 338, 344, 350, 356, 362, 368, 374,
-      (4,6,64): 380, 386, 392, 398, 404, 410, 416, 422, 428, 434, 440, 446,
-      (4,6,76): 452, 458, 464, 470, 476, 482, 488, 494, 500, 506, 512, 518,
-      (4,6,88): 524, 530, 536, 542, 548, 554, 560, 566, 572, 578, 584, 590,
-      (4,6,100): 596, 602, 608, 614, 620, 626, 632, 638, 644, 650, 656, 662,
-      (4,6,112): 668, 674, 680, 686, 692, 698, 704, 710, 716, 722, 728, 734,
-      (4,6,124): 740, 746, 752, 758,
-      (4,7,0): -4, 3, 10, 17, 24, 31, 38, 45, 52, 59, 66, 73, 80, 87, 94,
-      (4,7,15): 101, 108, 115, 122, 129, 136, 143, 150, 157, 164, 171, 178,
-      (4,7,27): 185, 192, 199, 206, 213, 220, 227, 234, 241, 248, 255, 262,
-      (4,7,39): 269, 276, 283, 290, 297, 304, 311, 318, 325, 332, 339, 346,
-      (4,7,51): 353, 360, 367, 374, 381, 388, 395, 402, 409, 416, 423, 430,
-      (4,7,63): 437, 444, 451, 458, 465, 472, 479, 486, 493, 500, 507, 514,
-      (4,7,75): 521, 528, 535, 542, 549, 556, 563, 570, 577, 584, 591, 598,
-      (4,7,87): 605, 612, 619, 626, 633, 640, 647, 654, 661, 668, 675, 682,
-      (4,7,99): 689, 696, 703, 710, 717, 724, 731, 738, 745, 752, 759, 766,
-      (4,7,111): 773, 780, 787, 794, 801, 808, 815, 822, 829, 836, 843, 850,
-      (4,7,123): 857, 864, 871, 878, 885,
-      (5,0,0): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,15): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,30): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,45): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,60): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,75): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,90): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,105): -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,0,120): -5, -5, -5, -5, -5, -5, -5, -5,
-      (5,1,0): -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-      (5,1,18): 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-      (5,1,33): 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
-      (5,1,48): 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
-      (5,1,63): 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
-      (5,1,78): 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
-      (5,1,93): 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
-      (5,1,107): 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
-      (5,1,119): 114, 115, 116, 117, 118, 119, 120, 121, 122,
-      (5,2,0): -5, -3, -1, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27,
-      (5,2,17): 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57,
-      (5,2,32): 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87,
-      (5,2,47): 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111, 113,
-      (5,2,60): 115, 117, 119, 121, 123, 125, 127, 129, 131, 133, 135, 137,
-      (5,2,72): 139, 141, 143, 145, 147, 149, 151, 153, 155, 157, 159, 161,
-      (5,2,84): 163, 165, 167, 169, 171, 173, 175, 177, 179, 181, 183, 185,
-      (5,2,96): 187, 189, 191, 193, 195, 197, 199, 201, 203, 205, 207, 209,
-      (5,2,108): 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233,
-      (5,2,120): 235, 237, 239, 241, 243, 245, 247, 249,
-      (5,3,0): -5, -2, 1, 4, 7, 10, 13, 16, 19, 22, 25, 28, 31, 34, 37, 40,
-      (5,3,16): 43, 46, 49, 52, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85,
-      (5,3,31): 88, 91, 94, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124,
-      (5,3,44): 127, 130, 133, 136, 139, 142, 145, 148, 151, 154, 157, 160,
-      (5,3,56): 163, 166, 169, 172, 175, 178, 181, 184, 187, 190, 193, 196,
-      (5,3,68): 199, 202, 205, 208, 211, 214, 217, 220, 223, 226, 229, 232,
-      (5,3,80): 235, 238, 241, 244, 247, 250, 253, 256, 259, 262, 265, 268,
-      (5,3,92): 271, 274, 277, 280, 283, 286, 289, 292, 295, 298, 301, 304,
-      (5,3,104): 307, 310, 313, 316, 319, 322, 325, 328, 331, 334, 337, 340,
-      (5,3,116): 343, 346, 349, 352, 355, 358, 361, 364, 367, 370, 373, 376,
-      (5,4,0): -5, -1, 3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55,
-      (5,4,16): 59, 63, 67, 71, 75, 79, 83, 87, 91, 95, 99, 103, 107, 111,
-      (5,4,30): 115, 119, 123, 127, 131, 135, 139, 143, 147, 151, 155, 159,
-      (5,4,42): 163, 167, 171, 175, 179, 183, 187, 191, 195, 199, 203, 207,
-      (5,4,54): 211, 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, 255,
-      (5,4,66): 259, 263, 267, 271, 275, 279, 283, 287, 291, 295, 299, 303,
-      (5,4,78): 307, 311, 315, 319, 323, 327, 331, 335, 339, 343, 347, 351,
-      (5,4,90): 355, 359, 363, 367, 371, 375, 379, 383, 387, 391, 395, 399,
-      (5,4,102): 403, 407, 411, 415, 419, 423, 427, 431, 435, 439, 443, 447,
-      (5,4,114): 451, 455, 459, 463, 467, 471, 475, 479, 483, 487, 491, 495,
-      (5,4,126): 499, 503,
-      (5,5,0): -5, 0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70,
-      (5,5,16): 75, 80, 85, 90, 95, 100, 105, 110, 115, 120, 125, 130, 135,
-      (5,5,29): 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, 190, 195,
-      (5,5,41): 200, 205, 210, 215, 220, 225, 230, 235, 240, 245, 250, 255,
-      (5,5,53): 260, 265, 270, 275, 280, 285, 290, 295, 300, 305, 310, 315,
-      (5,5,65): 320, 325, 330, 335, 340, 345, 350, 355, 360, 365, 370, 375,
-      (5,5,77): 380, 385, 390, 395, 400, 405, 410, 415, 420, 425, 430, 435,
-      (5,5,89): 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, 490, 495,
-      (5,5,101): 500, 505, 510, 515, 520, 525, 530, 535, 540, 545, 550, 555,
-      (5,5,113): 560, 565, 570, 575, 580, 585, 590, 595, 600, 605, 610, 615,
-      (5,5,125): 620, 625, 630,
-      (5,6,0): -5, 1, 7, 13, 19, 25, 31, 37, 43, 49, 55, 61, 67, 73, 79, 85,
-      (5,6,16): 91, 97, 103, 109, 115, 121, 127, 133, 139, 145, 151, 157,
-      (5,6,28): 163, 169, 175, 181, 187, 193, 199, 205, 211, 217, 223, 229,
-      (5,6,40): 235, 241, 247, 253, 259, 265, 271, 277, 283, 289, 295, 301,
-      (5,6,52): 307, 313, 319, 325, 331, 337, 343, 349, 355, 361, 367, 373,
-      (5,6,64): 379, 385, 391, 397, 403, 409, 415, 421, 427, 433, 439, 445,
-      (5,6,76): 451, 457, 463, 469, 475, 481, 487, 493, 499, 505, 511, 517,
-      (5,6,88): 523, 529, 535, 541, 547, 553, 559, 565, 571, 577, 583, 589,
-      (5,6,100): 595, 601, 607, 613, 619, 625, 631, 637, 643, 649, 655, 661,
-      (5,6,112): 667, 673, 679, 685, 691, 697, 703, 709, 715, 721, 727, 733,
-      (5,6,124): 739, 745, 751, 757,
-      (5,7,0): -5, 2, 9, 16, 23, 30, 37, 44, 51, 58, 65, 72, 79, 86, 93, 100,
-      (5,7,16): 107, 114, 121, 128, 135, 142, 149, 156, 163, 170, 177, 184,
-      (5,7,28): 191, 198, 205, 212, 219, 226, 233, 240, 247, 254, 261, 268,
-      (5,7,40): 275, 282, 289, 296, 303, 310, 317, 324, 331, 338, 345, 352,
-      (5,7,52): 359, 366, 373, 380, 387, 394, 401, 408, 415, 422, 429, 436,
-      (5,7,64): 443, 450, 457, 464, 471, 478, 485, 492, 499, 506, 513, 520,
-      (5,7,76): 527, 534, 541, 548, 555, 562, 569, 576, 583, 590, 597, 604,
-      (5,7,88): 611, 618, 625, 632, 639, 646, 653, 660, 667, 674, 681, 688,
-      (5,7,100): 695, 702, 709, 716, 723, 730, 737, 744, 751, 758, 765, 772,
-      (5,7,112): 779, 786, 793, 800, 807, 814, 821, 828, 835, 842, 849, 856,
-      (5,7,124): 863, 870, 877, 884,
-      (6,0,0): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,15): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,30): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,45): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,60): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,75): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,90): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,105): -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,0,120): -6, -6, -6, -6, -6, -6, -6, -6,
-      (6,1,0): -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
-      (6,1,18): 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-      (6,1,33): 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
-      (6,1,48): 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
-      (6,1,63): 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
-      (6,1,78): 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
-      (6,1,93): 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
-      (6,1,108): 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
-      (6,1,120): 114, 115, 116, 117, 118, 119, 120, 121,
-      (6,2,0): -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26,
-      (6,2,17): 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56,
-      (6,2,32): 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86,
-      (6,2,47): 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112,
-      (6,2,60): 114, 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136,
-      (6,2,72): 138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 160,
-      (6,2,84): 162, 164, 166, 168, 170, 172, 174, 176, 178, 180, 182, 184,
-      (6,2,96): 186, 188, 190, 192, 194, 196, 198, 200, 202, 204, 206, 208,
-      (6,2,108): 210, 212, 214, 216, 218, 220, 222, 224, 226, 228, 230, 232,
-      (6,2,120): 234, 236, 238, 240, 242, 244, 246, 248,
-      (6,3,0): -6, -3, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39,
-      (6,3,16): 42, 45, 48, 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84,
-      (6,3,31): 87, 90, 93, 96, 99, 102, 105, 108, 111, 114, 117, 120, 123,
-      (6,3,44): 126, 129, 132, 135, 138, 141, 144, 147, 150, 153, 156, 159,
-      (6,3,56): 162, 165, 168, 171, 174, 177, 180, 183, 186, 189, 192, 195,
-      (6,3,68): 198, 201, 204, 207, 210, 213, 216, 219, 222, 225, 228, 231,
-      (6,3,80): 234, 237, 240, 243, 246, 249, 252, 255, 258, 261, 264, 267,
-      (6,3,92): 270, 273, 276, 279, 282, 285, 288, 291, 294, 297, 300, 303,
-      (6,3,104): 306, 309, 312, 315, 318, 321, 324, 327, 330, 333, 336, 339,
-      (6,3,116): 342, 345, 348, 351, 354, 357, 360, 363, 366, 369, 372, 375,
-      (6,4,0): -6, -2, 2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54,
-      (6,4,16): 58, 62, 66, 70, 74, 78, 82, 86, 90, 94, 98, 102, 106, 110,
-      (6,4,30): 114, 118, 122, 126, 130, 134, 138, 142, 146, 150, 154, 158,
-      (6,4,42): 162, 166, 170, 174, 178, 182, 186, 190, 194, 198, 202, 206,
-      (6,4,54): 210, 214, 218, 222, 226, 230, 234, 238, 242, 246, 250, 254,
-      (6,4,66): 258, 262, 266, 270, 274, 278, 282, 286, 290, 294, 298, 302,
-      (6,4,78): 306, 310, 314, 318, 322, 326, 330, 334, 338, 342, 346, 350,
-      (6,4,90): 354, 358, 362, 366, 370, 374, 378, 382, 386, 390, 394, 398,
-      (6,4,102): 402, 406, 410, 414, 418, 422, 426, 430, 434, 438, 442, 446,
-      (6,4,114): 450, 454, 458, 462, 466, 470, 474, 478, 482, 486, 490, 494,
-      (6,4,126): 498, 502,
-      (6,5,0): -6, -1, 4, 9, 14, 19, 24, 29, 34, 39, 44, 49, 54, 59, 64, 69,
-      (6,5,16): 74, 79, 84, 89, 94, 99, 104, 109, 114, 119, 124, 129, 134,
-      (6,5,29): 139, 144, 149, 154, 159, 164, 169, 174, 179, 184, 189, 194,
-      (6,5,41): 199, 204, 209, 214, 219, 224, 229, 234, 239, 244, 249, 254,
-      (6,5,53): 259, 264, 269, 274, 279, 284, 289, 294, 299, 304, 309, 314,
-      (6,5,65): 319, 324, 329, 334, 339, 344, 349, 354, 359, 364, 369, 374,
-      (6,5,77): 379, 384, 389, 394, 399, 404, 409, 414, 419, 424, 429, 434,
-      (6,5,89): 439, 444, 449, 454, 459, 464, 469, 474, 479, 484, 489, 494,
-      (6,5,101): 499, 504, 509, 514, 519, 524, 529, 534, 539, 544, 549, 554,
-      (6,5,113): 559, 564, 569, 574, 579, 584, 589, 594, 599, 604, 609, 614,
-      (6,5,125): 619, 624, 629,
-      (6,6,0): -6, 0, 6, 12, 18, 24, 30, 36, 42, 48, 54, 60, 66, 72, 78, 84,
-      (6,6,16): 90, 96, 102, 108, 114, 120, 126, 132, 138, 144, 150, 156,
-      (6,6,28): 162, 168, 174, 180, 186, 192, 198, 204, 210, 216, 222, 228,
-      (6,6,40): 234, 240, 246, 252, 258, 264, 270, 276, 282, 288, 294, 300,
-      (6,6,52): 306, 312, 318, 324, 330, 336, 342, 348, 354, 360, 366, 372,
-      (6,6,64): 378, 384, 390, 396, 402, 408, 414, 420, 426, 432, 438, 444,
-      (6,6,76): 450, 456, 462, 468, 474, 480, 486, 492, 498, 504, 510, 516,
-      (6,6,88): 522, 528, 534, 540, 546, 552, 558, 564, 570, 576, 582, 588,
-      (6,6,100): 594, 600, 606, 612, 618, 624, 630, 636, 642, 648, 654, 660,
-      (6,6,112): 666, 672, 678, 684, 690, 696, 702, 708, 714, 720, 726, 732,
-      (6,6,124): 738, 744, 750, 756,
-      (6,7,0): -6, 1, 8, 15, 22, 29, 36, 43, 50, 57, 64, 71, 78, 85, 92, 99,
-      (6,7,16): 106, 113, 120, 127, 134, 141, 148, 155, 162, 169, 176, 183,
-      (6,7,28): 190, 197, 204, 211, 218, 225, 232, 239, 246, 253, 260, 267,
-      (6,7,40): 274, 281, 288, 295, 302, 309, 316, 323, 330, 337, 344, 351,
-      (6,7,52): 358, 365, 372, 379, 386, 393, 400, 407, 414, 421, 428, 435,
-      (6,7,64): 442, 449, 456, 463, 470, 477, 484, 491, 498, 505, 512, 519,
-      (6,7,76): 526, 533, 540, 547, 554, 561, 568, 575, 582, 589, 596, 603,
-      (6,7,88): 610, 617, 624, 631, 638, 645, 652, 659, 666, 673, 680, 687,
-      (6,7,100): 694, 701, 708, 715, 722, 729, 736, 743, 750, 757, 764, 771,
-      (6,7,112): 778, 785, 792, 799, 806, 813, 820, 827, 834, 841, 848, 855,
-      (6,7,124): 862, 869, 876, 883,
-      (7,0,0): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,15): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,30): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,45): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,60): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,75): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,90): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,105): -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,0,120): -7, -7, -7, -7, -7, -7, -7, -7,
-      (7,1,0): -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-      (7,1,18): 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-      (7,1,33): 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-      (7,1,48): 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-      (7,1,63): 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
-      (7,1,78): 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
-      (7,1,93): 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
-      (7,1,108): 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
-      (7,1,120): 113, 114, 115, 116, 117, 118, 119, 120,
-      (7,2,0): -7, -5, -3, -1, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25,
-      (7,2,17): 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55,
-      (7,2,32): 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85,
-      (7,2,47): 87, 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111,
-      (7,2,60): 113, 115, 117, 119, 121, 123, 125, 127, 129, 131, 133, 135,
-      (7,2,72): 137, 139, 141, 143, 145, 147, 149, 151, 153, 155, 157, 159,
-      (7,2,84): 161, 163, 165, 167, 169, 171, 173, 175, 177, 179, 181, 183,
-      (7,2,96): 185, 187, 189, 191, 193, 195, 197, 199, 201, 203, 205, 207,
-      (7,2,108): 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231,
-      (7,2,120): 233, 235, 237, 239, 241, 243, 245, 247,
-      (7,3,0): -7, -4, -1, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35, 38,
-      (7,3,16): 41, 44, 47, 50, 53, 56, 59, 62, 65, 68, 71, 74, 77, 80, 83,
-      (7,3,31): 86, 89, 92, 95, 98, 101, 104, 107, 110, 113, 116, 119, 122,
-      (7,3,44): 125, 128, 131, 134, 137, 140, 143, 146, 149, 152, 155, 158,
-      (7,3,56): 161, 164, 167, 170, 173, 176, 179, 182, 185, 188, 191, 194,
-      (7,3,68): 197, 200, 203, 206, 209, 212, 215, 218, 221, 224, 227, 230,
-      (7,3,80): 233, 236, 239, 242, 245, 248, 251, 254, 257, 260, 263, 266,
-      (7,3,92): 269, 272, 275, 278, 281, 284, 287, 290, 293, 296, 299, 302,
-      (7,3,104): 305, 308, 311, 314, 317, 320, 323, 326, 329, 332, 335, 338,
-      (7,3,116): 341, 344, 347, 350, 353, 356, 359, 362, 365, 368, 371, 374,
-      (7,4,0): -7, -3, 1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53,
-      (7,4,16): 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109,
-      (7,4,30): 113, 117, 121, 125, 129, 133, 137, 141, 145, 149, 153, 157,
-      (7,4,42): 161, 165, 169, 173, 177, 181, 185, 189, 193, 197, 201, 205,
-      (7,4,54): 209, 213, 217, 221, 225, 229, 233, 237, 241, 245, 249, 253,
-      (7,4,66): 257, 261, 265, 269, 273, 277, 281, 285, 289, 293, 297, 301,
-      (7,4,78): 305, 309, 313, 317, 321, 325, 329, 333, 337, 341, 345, 349,
-      (7,4,90): 353, 357, 361, 365, 369, 373, 377, 381, 385, 389, 393, 397,
-      (7,4,102): 401, 405, 409, 413, 417, 421, 425, 429, 433, 437, 441, 445,
-      (7,4,114): 449, 453, 457, 461, 465, 469, 473, 477, 481, 485, 489, 493,
-      (7,4,126): 497, 501,
-      (7,5,0): -7, -2, 3, 8, 13, 18, 23, 28, 33, 38, 43, 48, 53, 58, 63, 68,
-      (7,5,16): 73, 78, 83, 88, 93, 98, 103, 108, 113, 118, 123, 128, 133,
-      (7,5,29): 138, 143, 148, 153, 158, 163, 168, 173, 178, 183, 188, 193,
-      (7,5,41): 198, 203, 208, 213, 218, 223, 228, 233, 238, 243, 248, 253,
-      (7,5,53): 258, 263, 268, 273, 278, 283, 288, 293, 298, 303, 308, 313,
-      (7,5,65): 318, 323, 328, 333, 338, 343, 348, 353, 358, 363, 368, 373,
-      (7,5,77): 378, 383, 388, 393, 398, 403, 408, 413, 418, 423, 428, 433,
-      (7,5,89): 438, 443, 448, 453, 458, 463, 468, 473, 478, 483, 488, 493,
-      (7,5,101): 498, 503, 508, 513, 518, 523, 528, 533, 538, 543, 548, 553,
-      (7,5,113): 558, 563, 568, 573, 578, 583, 588, 593, 598, 603, 608, 613,
-      (7,5,125): 618, 623, 628,
-      (7,6,0): -7, -1, 5, 11, 17, 23, 29, 35, 41, 47, 53, 59, 65, 71, 77, 83,
-      (7,6,16): 89, 95, 101, 107, 113, 119, 125, 131, 137, 143, 149, 155,
-      (7,6,28): 161, 167, 173, 179, 185, 191, 197, 203, 209, 215, 221, 227,
-      (7,6,40): 233, 239, 245, 251, 257, 263, 269, 275, 281, 287, 293, 299,
-      (7,6,52): 305, 311, 317, 323, 329, 335, 341, 347, 353, 359, 365, 371,
-      (7,6,64): 377, 383, 389, 395, 401, 407, 413, 419, 425, 431, 437, 443,
-      (7,6,76): 449, 455, 461, 467, 473, 479, 485, 491, 497, 503, 509, 515,
-      (7,6,88): 521, 527, 533, 539, 545, 551, 557, 563, 569, 575, 581, 587,
-      (7,6,100): 593, 599, 605, 611, 617, 623, 629, 635, 641, 647, 653, 659,
-      (7,6,112): 665, 671, 677, 683, 689, 695, 701, 707, 713, 719, 725, 731,
-      (7,6,124): 737, 743, 749, 755,
-      (7,7,0): -7, 0, 7, 14, 21, 28, 35, 42, 49, 56, 63, 70, 77, 84, 91, 98,
-      (7,7,16): 105, 112, 119, 126, 133, 140, 147, 154, 161, 168, 175, 182,
-      (7,7,28): 189, 196, 203, 210, 217, 224, 231, 238, 245, 252, 259, 266,
-      (7,7,40): 273, 280, 287, 294, 301, 308, 315, 322, 329, 336, 343, 350,
-      (7,7,52): 357, 364, 371, 378, 385, 392, 399, 406, 413, 420, 427, 434,
-      (7,7,64): 441, 448, 455, 462, 469, 476, 483, 490, 497, 504, 511, 518,
-      (7,7,76): 525, 532, 539, 546, 553, 560, 567, 574, 581, 588, 595, 602,
-      (7,7,88): 609, 616, 623, 630, 637, 644, 651, 658, 665, 672, 679, 686,
-      (7,7,100): 693, 700, 707, 714, 721, 728, 735, 742, 749, 756, 763, 770,
-      (7,7,112): 777, 784, 791, 798, 805, 812, 819, 826, 833, 840, 847, 854,
-      (7,7,124): 861, 868, 875, 882
-      }
    }
 }
 }
diff --git a/config/cmake/binex/example/testfiles/h5ex_d_sz.tst b/config/cmake/binex/example/testfiles/h5ex_d_sz.tst
index 67b4754d..04543b28 100644
--- a/config/cmake/binex/example/testfiles/h5ex_d_sz.tst
+++ b/config/cmake/binex/example/testfiles/h5ex_d_sz.tst
@@ -4,8 +4,8 @@ SZ filter is available for encoding and decoding.
 ....Close the file and reopen for reading ........
 Filter info is available from the dataset creation property
    Filter identifier is 32017
-   Number of parameters is 5 with the value 3
+   Number of parameters is 14 with the value 3
    To find more about the filter check SZ compressor/decompressor for floating-point data.
 ....Reading SZ compressed data ................
-Maximum value in DS1 is 889.0000
+Maximum value in DS1 is 8190.8975
 SZ filter is available now since H5Dread triggered loading of the filter.
diff --git a/config/cmake/binex/example/testfiles/h5ex_d_zfp.ddl b/config/cmake/binex/example/testfiles/h5ex_d_zfp.ddl
index 7d73913f..d5ebd287 100644
--- a/config/cmake/binex/example/testfiles/h5ex_d_zfp.ddl
+++ b/config/cmake/binex/example/testfiles/h5ex_d_zfp.ddl
@@ -10,7 +10,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
diff --git a/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst b/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst
index 0a1ba90a..5cf68903 100644
--- a/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst
+++ b/config/cmake/binex/example/testfiles/h5ex_d_zfp.tst
@@ -4,8 +4,8 @@ zfp filter is available for encoding and decoding.
 ....Close the file and reopen for reading ........
 Filter info is available from the dataset creation property
    Filter identifier is 32013
-   Number of parameters is 6 with the value 5570817
-   To find more about the filter check H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+   Number of parameters is 6 with the value 268456208
+   To find more about the filter check H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
 ....Reading zfp compressed data ................
 Maximum value in DS1 is 1890.0000
 zfp filter is available now since H5Dread triggered loading of the filter.
diff --git a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_convert.ddl b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_convert.ddl
index f83a958b..3f3aad56 100644
--- a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_convert.ddl
+++ b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_convert.ddl
@@ -32,7 +32,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
@@ -54,7 +54,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
@@ -76,7 +76,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
@@ -98,7 +98,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
@@ -120,7 +120,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
@@ -142,7 +142,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
diff --git a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_blosc_convert.ddl b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_blosc_convert.ddl
index 30c15bd1..71eef2a2 100644
--- a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_blosc_convert.ddl
+++ b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_blosc_convert.ddl
@@ -27,7 +27,7 @@ GROUP "/" {
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
       STORAGE_LAYOUT {
          CHUNKED ( 40, 20 )
-         SIZE 354 (9.040:1 COMPRESSION)
+         SIZE 896 (3.571:1 COMPRESSION)
       }
       FILTERS {
          USER_DEFINED_FILTER {
@@ -124,7 +124,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 3200
-         OFFSET 26160
+         OFFSET 26960
       }
       FILTERS {
          NONE
diff --git a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_convert.ddl b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_convert.ddl
index dab5d423..b6aea4db 100644
--- a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_convert.ddl
+++ b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_convert.ddl
@@ -76,7 +76,7 @@ GROUP "/" {
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 32013
-            COMMENT H5Z-ZFP-1.0.1 (ZFP-0.5.5) github.com/LLNL/H5Z-ZFP
+            COMMENT H5Z-ZFP-1.1.0 (ZFP-1.0.0) github.com/LLNL/H5Z-ZFP
             PARAMS { XXXX }
          }
       }
diff --git a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_lz4_convert.ddl b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_lz4_convert.ddl
index 7b20ee4f..d94586e1 100644
--- a/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_lz4_convert.ddl
+++ b/config/cmake/binex/example/testfiles/h5repack_layout.h5-ud_pl_lz4_convert.ddl
@@ -27,7 +27,7 @@ GROUP "/" {
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
       STORAGE_LAYOUT {
          CHUNKED ( 40, 20 )
-         SIZE 354 (9.040:1 COMPRESSION)
+         SIZE 896 (3.571:1 COMPRESSION)
       }
       FILTERS {
          USER_DEFINED_FILTER {
@@ -127,7 +127,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 3200
-         OFFSET 35209
+         OFFSET 35561
       }
       FILTERS {
          NONE
diff --git a/config/cmake/binex/example/testfiles/ud_blosc_convert.h5repack_layout.h5.tst b/config/cmake/binex/example/testfiles/ud_blosc_convert.h5repack_layout.h5.tst
index 6ef841e5..1f7d10e1 100644
--- a/config/cmake/binex/example/testfiles/ud_blosc_convert.h5repack_layout.h5.tst
+++ b/config/cmake/binex/example/testfiles/ud_blosc_convert.h5repack_layout.h5.tst
@@ -8,7 +8,7 @@ Making new file ...
 -----------------------------------------
  group                       /
  dset                        /dset1
- dset     UD   (9.040:1)     /dset2
+ dset     UD   (3.571:1)     /dset2
  dset                        /dset3
  dset                        /dset4
  dset                        /dset_chunk
diff --git a/docs/INSTALL_With_CMake.txt b/docs/INSTALL_With_CMake.txt
index aebbd0fc..73fd4a78 100644
--- a/docs/INSTALL_With_CMake.txt
+++ b/docs/INSTALL_With_CMake.txt
@@ -23,13 +23,13 @@ Obtaining HDF5 Filter source code
    2. Obtain compressed (*.tar or *.zip) HDF5 Filter source from
          https://portal.hdfgroup.org/display/support/Building+HDF5+filters+with+CMake
       and put it in "myhdfstuff".
-      Uncompress the file. There should be a hdf5_plugins-1.10."X" folder.
+      Uncompress the file. There should be a hdf5_plugins-1."Y.X" folder.
 
 CMake version
    1. We suggest you obtain the latest CMake from the Kitware web site.
-      The HDF5 Filters 1.10."X" product requires a minimum CMake version 3.12,
-      where "X" is the current HDF5 release version. If you are using
-      VS2019, the minimum version is 3.15.
+      The HDF5 Filters 1."Y.X" product requires a minimum CMake version 3.12,
+      where "Y.X" is the current HDF5 release version. If you are using
+      VS2022, the minimum version is 3.21.
 
 Note:
    To change the install prefix from the platform defaults initialize
@@ -49,7 +49,7 @@ The following files referenced below are available at the HDF web site:
      https://portal.hdfgroup.org/display/support/Building+HDF5+filters+with+CMake
 
 Single compressed file with all the files needed, including source:
-    CMake-hdf5_plugins-1.10.X.zip or CMake-hdf5_plugins-1.10.X.tar.gz
+    CMake-hdf5_plugins-1."Y.X"X.zip or CMake-hdf5_plugins-1."Y.X".tar.gz
 
 Individual files included in the above mentioned compressed files
 -----------------------------------------------
@@ -69,10 +69,10 @@ To build HDF5 Filter libraries you will need to:
 
    1. Change to the development directory "myhdfstuff".
 
-   2. Download the CMake-hdf5_plugins-1.10.X.zip(.tar.gz) file to "myhdfstuff".
+   2. Download the CMake-hdf5_plugins-1."Y.X".zip(.tar.gz) file to "myhdfstuff".
       Uncompress the file.
 
-   3. Change to the source directory "hdf5_plugins-1.10.x".
+   3. Change to the source directory "hdf5_plugins-1.y.x".
       CTestScript.cmake file should not be modified.
 
    4. Edit the platform configuration file, HDFoptions.cmake, if you want to change
@@ -100,7 +100,7 @@ To build HDF5 Filter libraries you will need to:
 
       The command above will configure, build, test, and create an install
       package in the myhdfstuff folder. It will have the format:
-          HDF5_Plugins-1.10.NN-<platform>.<zip or tar.gz>
+          HDF5_Plugins-1."Y.X"-<platform>.<zip or tar.gz>
 
           On Unix, <platform> will be "Linux". A similar .sh file will also be created.
           On Windows, <platform> will be "win64" or "win32". If you have an
@@ -121,51 +121,51 @@ To build HDF5 Filter libraries you will need to:
    6. To install, "X" is the current release version
 
       On Windows (with WiX installed), execute:
-                HDF5_plugins-1.10."X"-win32.msi or HDF5_plugins-1.10."X"-win64.msi
+                HDF5_plugins-1."Y.X"-win32.msi or HDF5_plugins-1."Y.X"-win64.msi
       By default this program will install the hdf5 filter libraries into the
       "C:\Program Files" directory and will create the following
       directory structure:
          HDF_Group
          --HDF5
-         ----1.10."X"
+         ----1."Y.X"
          ------lib
          --------plugins
          ------cmake
 
       On Linux, change to the install destination directory
       (create it if doesn't exist) and execute:
-                <path-to>/myhdfstuff/HDF5_plugins-1.10."X"-Linux.sh
+                <path-to>/myhdfstuff/HDF5_plugins-1."Y.X"-Linux.sh
       After accepting the license, the script will prompt:
         By default the HDF5 filter libraries will be installed in:
-        "<current directory>/HDF5-1.10."X"-Linux"
-        Do you want to include the subdirectory HDF5-1.10."X"-Linux?
+        "<current directory>/HDF5-1."Y.X"-Linux"
+        Do you want to include the subdirectory HDF5-1."Y.X"-Linux?
         Saying no will install in: "<current directory>" [Yn]:
       Note that the script will create the following directory structure
       relative to the install point:
          HDF_Group
          --HDF5
-         ----1.10."X"
+         ----1."Y.X"
          ------lib
          --------plugins
          ------share
 
-      On Mac you will find HDF5_plugins-1.10."X"-Darwin.dmg in the myhdfstuff folder. Click
+      On Mac you will find HDF5_plugins-1."Y.X"-Darwin.dmg in the myhdfstuff folder. Click
       on the dmg file to proceed with installation. After accepting the license,
       there will be a folder with the following structure:
          HDF_Group
          --HDF5
-         ----1.10."X"
+         ----1."Y.X"
          ------lib
          --------plugins
          ------share
 
       By default the installation will create or merge the lib and cmake
-      folders in the <install destination directory>/HDF_Group/HDF5/1.10."X"
+      folders in the <install destination directory>/HDF_Group/HDF5/1."Y.X"
       The <install destination directory> depends on the build platform;
         Windows will set the default to:
-          C:/Program Files/HDF_Group/HDF5/1.10."X"
+          C:/Program Files/HDF_Group/HDF5/1."Y.X"
         Linux will set the default to:
-          "myhdfstuff/HDF_Group/HDF5/1.10."X"
+          "myhdfstuff/HDF_Group/HDF5/1."Y.X"
       The default can be changed by adding ",INSTALLDIR=<my new dir>" to the
           "ctest -S HDF5config.cmake..." command. For example on linux:
          ctest -S HDF5config.cmake,INSTALLDIR=/usr/local/myhdf5,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
@@ -192,13 +192,13 @@ Notes: This short set of instructions is written for users who want to
       5. Configure the C filter libraries with one of the following commands:
 
          On Windows 32 bit
-           cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_EXAMPLES:BOOL=ON ..\hdf5_plugins-1.10."X"
+           cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_EXAMPLES:BOOL=ON ..\hdf5_plugins-1."Y.X"
 
          On Windows 64 bit
-           cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_EXAMPLES:BOOL=ON ..\hdf5_plugins-1.10."X"
+           cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_EXAMPLES:BOOL=ON ..\hdf5_plugins-1."Y.X"
 
          On Linux and Mac
-           cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_EXAMPLES:BOOL=ON ../hdf5_plugins-1.10."X"
+           cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_EXAMPLES:BOOL=ON ../hdf5_plugins-1."Y.X"
 
          where "X" is the current release version.
 
@@ -213,40 +213,40 @@ Notes: This short set of instructions is written for users who want to
 
       9. To install
          On Windows (with WiX installed), execute:
-                HDF5_plugins-1.10."X"-win32.msi or HDF5_plugins-1.10."X"-win64.msi
+                HDF5_plugins-1."Y.X"-win32.msi or HDF5_plugins-1."Y.X"-win64.msi
          By default this program will install the hdf5 library into the
          "C:\Program Files" directory and will create the following
          directory structure:
             HDF_Group
             --HDF5
-            ----1.10."X"
+            ----1."Y.X"
             ------lib
             --------plugins
             ------cmake
 
          On Linux, change to the install destination directory
          (create if doesn't exist) and execute:
-                <path-to>/myhdfstuff/build/HDF5_plugins-1.10."X"-Linux.sh
+                <path-to>/myhdfstuff/build/HDF5_plugins-1."Y.X"-Linux.sh
          After accepting the license, the script will prompt:
            By default the HDF5 will be installed in:
-           "<current directory>/HDF5_plugins-1.10."X"-Linux"
-           Do you want to include the subdirectory HDF5_plugins-1.10."X"-Linux?
+           "<current directory>/HDF5_plugins-1."Y.X"-Linux"
+           Do you want to include the subdirectory HDF5_plugins-1."Y.X"-Linux?
            Saying no will install in: "<current directory>" [Yn]:
          Note that the script will create the following directory structure
          relative to the install point:
             HDF_Group
             --HDF5
-            ----1.10."X"
+            ----1."Y.X"
             ------lib
             --------plugins
             ------share
 
-         On Mac you will find HDF5_plugins-1.10."X"-Darwin.dmg in the build folder. Click
+         On Mac you will find HDF5_plugins-1."Y.X"-Darwin.dmg in the build folder. Click
          on the dmg file to proceed with installation. After accepting the license,
          there will be a folder with the following structure:
             HDF_Group
             --HDF5
-            ----1.10."X"
+            ----1."Y.X"
             ------lib
             --------plugins
             ------share
@@ -257,7 +257,7 @@ IV. Further considerations
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5 1.10."X" product requires a minimum CMake version 3.12.
+      web site. The HDF5 1."Y.X" product requires a minimum CMake version 3.12.
 
    2. If you are building on Apple Darwin platforms, you should add the
       following options:
diff --git a/docs/PluginLibraries.txt b/docs/PluginLibraries.txt
index 93983377..038ab698 100644
--- a/docs/PluginLibraries.txt
+++ b/docs/PluginLibraries.txt
@@ -153,7 +153,7 @@ Contact Information:
     Email: faltet at pytables dot org
 
 --------------------------------------------
-Compression Library Included: c-blosc version 1.12.1
+Compression Library Included: c-blosc version 1.21.0
 
 Plugin cd_value option
 --------------------------------------------
diff --git a/docs/USING_HDF5_AND_CMake.txt b/docs/USING_HDF5_AND_CMake.txt
index 1230801a..dfcd76d0 100644
--- a/docs/USING_HDF5_AND_CMake.txt
+++ b/docs/USING_HDF5_AND_CMake.txt
@@ -36,7 +36,7 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for your platform from the Kitware
-      web site. The HDF5 1.10.x product requires a minimum CMake version
+      web site. The HDF5 1.y.x product requires a minimum CMake version
       of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
       using VS2022, the minimum version is 3.21.
 
@@ -49,24 +49,24 @@ I. Preconditions
       or environment variable, set(ENV{HDF5_ROOT} "<install_path>")
       to the installed location of HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       If you are using shared libraries, you may need to add to the path
       environment variable. Set the path environment variable to the
       installed location of the library files for HDF5.
          On Windows (*.dll):
-            PATH=%PATH%;C:/Program Files/HDF_Group/HDF5/1.10.x/bin
+            PATH=%PATH%;C:/Program Files/HDF_Group/HDF5/1.y.x/bin
          On unix (*.so):
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH:<install root folder>/HDF_Group/HDF5/1.10.x/lib
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH:<install root folder>/HDF_Group/HDF5/1.y.x/lib
 
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -74,9 +74,9 @@ I. Preconditions
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)
diff --git a/libs/zstd.tar.gz b/libs/zstd.tar.gz
index 8236233f..a0b103e5 100644
Binary files a/libs/zstd.tar.gz and b/libs/zstd.tar.gz differ