diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml
index 49738a4aaca..3dff15cc006 100644
--- a/.github/workflows/release-files.yml
+++ b/.github/workflows/release-files.yml
@@ -178,6 +178,7 @@ jobs:
           sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.html.abi.reports.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
 
       - name: Create sha256 sums for files  for nonversioned files
+        if: ${{ (inputs.use_environ == 'release') }}
         run: |
           sha256sum hdf5.zip >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
           sha256sum hdf5.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 514365d616d..ea492b51f9b 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-option (USE_LIBAEC_STATIC "Use static AEC library " OFF)
+option (USE_LIBAEC_STATIC "Use static AEC library" OFF)
 option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" OFF)
 option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" OFF)
 
@@ -66,14 +66,17 @@ endif ()
 #-----------------------------------------------------------------------------
 # Option for ZLib support
 #-----------------------------------------------------------------------------
+set(H5_ZLIB_FOUND FALSE)
 option (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" ON)
 if (HDF5_ENABLE_Z_LIB_SUPPORT)
   if (NOT H5_ZLIB_HEADER)
     if (NOT ZLIB_USE_EXTERNAL)
+      set(ZLIB_FOUND FALSE)
       find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-      if (NOT H5_ZLIB_FOUND)
+      if (NOT ZLIB_FOUND)
         find_package (ZLIB) # Legacy find
       endif ()
+      set(H5_ZLIB_FOUND ${ZLIB_FOUND})
       if (H5_ZLIB_FOUND)
         set (H5_ZLIB_HEADER "zlib.h")
         set (H5_ZLIB_INCLUDE_DIR_GEN ${H5_ZLIB_INCLUDE_DIR})
@@ -89,9 +92,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
     endif ()
   else ()
     # This project is being called from within another and ZLib is already configured
-    set (H5_HAVE_FILTER_DEFLATE 1)
-    set (H5_HAVE_ZLIB_H 1)
-    set (H5_HAVE_LIBZ 1)
+    set(H5_ZLIB_FOUND TRUE)
   endif ()
   if (H5_ZLIB_FOUND)
     set (H5_HAVE_FILTER_DEFLATE 1)
@@ -111,22 +112,23 @@ endif ()
 #-----------------------------------------------------------------------------
 # Option for SzLib support
 #-----------------------------------------------------------------------------
+set(H5_SZIP_FOUND FALSE)
 option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" ON)
 if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON)
   if (NOT SZIP_USE_EXTERNAL)
-    set(H5_SZIP_FOUND FALSE)
-    set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
+    set(libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC})
+    set(SZIP_FOUND FALSE)
     find_package (libaec 1.0.5 CONFIG)
-    if (H5_SZIP_FOUND)
+    if (SZIP_FOUND)
       set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${H5_SZIP_LIBRARIES})
-    endif ()
-    if (NOT H5_SZIP_FOUND)
+    else ()
       find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-      if (NOT H5_SZIP_FOUND)
+      if (NOT SZIP_FOUND)
         find_package (SZIP) # Legacy find
       endif ()
     endif ()
+    set(H5_SZIP_FOUND ${SZIP_FOUND})
     if (H5_SZIP_FOUND)
       set (H5_SZIP_INCLUDE_DIR_GEN ${H5_SZIP_INCLUDE_DIR})
       set (H5_SZIP_INCLUDE_DIRS ${H5_SZIP_INCLUDE_DIRS} ${H5_SZIP_INCLUDE_DIR})