Merge branch 'develop' into post_open_fix

143 files changed, 2451 insertions, 2019 deletions

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index d5f801e..51ac61c 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -10,6 +10,7 @@
 # help@hdfgroup.org.
 #
 option (USE_LIBAEC "Use AEC library as SZip Filter" OFF)
+option (USE_LIBAEC_STATIC "Use static AEC library " OFF)
 
 include (ExternalProject)
 include (FetchContent)
@@ -110,13 +111,24 @@ option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 if (HDF5_ENABLE_SZIP_SUPPORT)
   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
   if (NOT SZIP_USE_EXTERNAL)
-    find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-    if (NOT SZIP_FOUND)
-      find_package (SZIP) # Legacy find
+    set(SZIP_FOUND FALSE)
+    if (USE_LIBAEC)
+      set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
+      find_package (libaec 1.0.5 CONFIG)
       if (SZIP_FOUND)
         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
       endif ()
     endif ()
+
+    if (NOT SZIP_FOUND)
+      find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+      if (NOT SZIP_FOUND)
+        find_package (SZIP) # Legacy find
+        if (SZIP_FOUND)
+          set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
+        endif ()
+      endif ()
+    endif ()
   endif ()
   if (SZIP_FOUND)
     set (H5_HAVE_FILTER_SZIP 1)
diff --git a/MANIFEST b/MANIFEST
index b6b50f2..735eea3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -202,7 +202,8 @@
 ./config/intel-warnings/18
 ./config/intel-warnings/developer-general
 ./config/intel-warnings/general
-./config/intel-warnings/general-19
+./config/intel-warnings/win-developer-general
+./config/intel-warnings/win-general
 ./config/intel-warnings/ifort-general
 
 ./config/site-specific/BlankForm
@@ -1169,6 +1170,7 @@
 ./test/cork.c
 ./test/corrupt_stab_msg.h5
 ./test/cross_read.c
+./test/cve_2020_10810.h5
 ./test/dangle.c
 ./test/deflate.h5
 ./test/del_many_dense_attrs.c
@@ -2947,6 +2949,15 @@
 ./tools/testfiles/h5mkgrp_single_p.ls
 ./tools/testfiles/h5mkgrp_single_l.ls
 
+./tools/src/h5perf/Makefile.am
+./tools/src/h5perf/perf.c
+./tools/src/h5perf/pio_engine.c
+./tools/src/h5perf/pio_perf.c
+./tools/src/h5perf/pio_perf.h
+./tools/src/h5perf/sio_engine.c
+./tools/src/h5perf/sio_perf.c
+./tools/src/h5perf/sio_perf.h
+
 ./tools/test/perform/Makefile.am
 ./tools/test/perform/build_h5perf_alone.sh
 ./tools/test/perform/build_h5perf_serial_alone.sh
@@ -2956,16 +2967,9 @@
 ./tools/test/perform/gen_report.pl
 ./tools/test/perform/iopipe.c
 ./tools/test/perform/overhead.c
-./tools/test/perform/perf.c
 ./tools/test/perform/perf_meta.c
-./tools/test/perform/pio_engine.c
-./tools/test/perform/pio_perf.c
-./tools/test/perform/pio_perf.h
 ./tools/test/perform/pio_standalone.c
 ./tools/test/perform/pio_standalone.h
-./tools/test/perform/sio_engine.c
-./tools/test/perform/sio_perf.c
-./tools/test/perform/sio_perf.h
 ./tools/test/perform/sio_standalone.c
 ./tools/test/perform/sio_standalone.h
 ./tools/test/perform/zip_perf.c
@@ -3710,6 +3714,7 @@
 ./tools/test/h5stat/CMakeLists.txt
 ./tools/test/h5stat/CMakeTests.cmake
 ./tools/src/misc/CMakeLists.txt
+./tools/src/h5perf/CMakeLists.txt
 ./tools/test/misc/CMakeLists.txt
 ./tools/test/misc/CMakeTestsClear.cmake
 ./tools/test/misc/CMakeTestsMkgrp.cmake
diff --git a/bin/release b/bin/release
index 2570b38..0726b8c 100755
--- a/bin/release
+++ b/bin/release
@@ -229,11 +229,14 @@ tar2cmakezip()
     (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201564 -C Release -V -O hdf5.log" > build-VS2015-64.bat; chmod 755 build-VS2015-64.bat)
     (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2017 -C Release -V -O hdf5.log" > build-VS2017-32.bat; chmod 755 build-VS2017-32.bat)
     (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -V -O hdf5.log" > build-VS2017-64.bat; chmod 755 build-VS2017-64.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2019 -C Release -V -O hdf5.log" > build-VS2019-32.bat; chmod 755 build-VS2019-32.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201964 -C Release -V -O hdf5.log" > build-VS2019-64.bat; chmod 755 build-VS2019-64.bat)
 
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmziptmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.14.1-Source.zip $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.14.3-Source.zip $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.zip $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpsubdir
@@ -328,7 +331,8 @@ tar2cmaketgz()
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.14.1-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.14.3-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
@@ -411,7 +415,8 @@ tar2hpccmaketgz()
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.14.1-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.14.3-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
 
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index b00a526..af58a90 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -338,10 +338,7 @@ DataType::encode()
 bool
 DataType::hasBinaryDesc() const
 {
-    if (encoded_buf != NULL)
-        return true;
-    else
-        return false;
+    return encoded_buf != NULL;
 }
 
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index d546d32..e1fc687 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -432,10 +432,7 @@ IdComponent::p_valid_id(const hid_t obj_id)
         return false;
 
     H5I_type_t id_type = H5Iget_type(obj_id);
-    if (id_type <= H5I_BADID || id_type >= H5I_NTYPES)
-        return false;
-    else
-        return true;
+    return (id_type > H5I_BADID && id_type < H5I_NTYPES);
 }
 
 // Notes about IdComponent::id
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 7dca716..7ee8395 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -543,7 +543,7 @@ PropList::getPropSize(const H5std_string &name) const
 // Function:    PropList::getClassName
 ///\brief       Return the name of a generic property list class.
 ///\return      A string containing the class name, if success, otherwise,
-///             a NULL string.
+///             an empty string.
 // Programmer:  Binh-Minh Ribler - April, 2004
 //--------------------------------------------------------------------------
 H5std_string
@@ -557,8 +557,9 @@ PropList::getClassName() const
         return (class_name);
     }
     else
-        return 0;
+        return "";
 }
+
 //--------------------------------------------------------------------------
 // Function:    PropList::getNumProps
 ///\brief       Returns the number of properties in this property list or class.
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index cf993b9..573d20d 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -35,10 +35,10 @@ HL="@HL@"
 ## (Advanced usage - know what you're doing - you're on your own here.)   ##
 ## The four variables below can be used to insert paths and flags in      ##
 ## CPPFLAGS, CXXFLAGS, LDFLAGS, or LIBS in the h5cc compile line:         ##
-##    $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS        ##
+##    $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS      ##
 ##    $LDFLAGS $LIBS $clibpath $link_objs $link_args $shared_link         ##
 ##                                                                        ##
-## These settings can be overridden by setting HDF5_CXXFLAGS,              ##
+## These settings can be overridden by setting HDF5_CXXFLAGS,             ##
 ## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment.          ##
 ##                                                                        ##
 ############################################################################
@@ -93,7 +93,7 @@ H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
 H5BLD_LIBS="@LIBS@"
 
 CXX="${HDF5_CXX:-$CXXBASE}"
-CXXLINKER="${HDF5_CLINKER:-$CXXLINKERBASE}"
+CXXLINKER="${HDF5_CXXLINKER:-$CXXLINKERBASE}"
 CXXFLAGS="${HDF5_CXXFLAGS:-$CXXFLAGSBASE}"
 CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}"
 LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 35db334..26699d2 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -285,7 +285,7 @@ test_attr_getname()
 
         // Check for existence of attribute FATTR1_NAME
         bool attr_exists = fid1.attrExists(FATTR1_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
         // Open attribute
@@ -361,7 +361,7 @@ test_attr_getname()
 
         // Check for existence of attribute
         attr_exists = dataset.attrExists(ATTR1_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
         // Open attribute
@@ -410,7 +410,7 @@ test_attr_rename()
 
         // Check for existence of attribute
         bool attr_exists = fid1.attrExists(FATTR1_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
         // Change attribute name
@@ -436,7 +436,7 @@ test_attr_rename()
 
         // Check for existence of attribute
         attr_exists = dataset.attrExists(ATTR1_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
         // Change attribute name
@@ -464,7 +464,7 @@ test_attr_rename()
 
         // Check for existence of second attribute
         attr_exists = dataset.attrExists(ATTR2_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
         // Open the second attribute
@@ -492,7 +492,7 @@ test_attr_rename()
 
         // Check for existence of attribute after renaming
         attr_exists = dataset.attrExists(ATTR1_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
         PASSED();
@@ -1681,13 +1681,13 @@ test_attr_exists()
 
         // Check for existence of attribute
         bool attr_exists = fid1.attrExists(ATTR1_FL_STR_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists",
                                          "fid1, ATTR1_FL_STR_NAMEAttribute should exist but does not");
 
         // Check for existence of attribute
         attr_exists = fid1.attrExists(FATTR1_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists",
                                          "fid1,FATTR2_NAMEAttribute should exist but does not");
 
@@ -1696,7 +1696,7 @@ test_attr_exists()
 
         // Check for existence of attribute
         attr_exists = group.attrExists(ATTR2_NAME);
-        if (attr_exists == false)
+        if (!attr_exists)
             throw InvalidActionException("H5File::attrExists",
                                          "group, ATTR2_NAMEAttribute should exist but does not");
 
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 1cedef6..69c93d1 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -699,7 +699,7 @@ test_named()
         }
 
         // Check that it is committed.
-        if (itype.committed() == false)
+        if (!itype.committed())
             cerr << "IntType::committed() returned false" << endl;
 
         // We should not be able to modify a type after it has been committed.
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 7baf77b..263cedf 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -149,7 +149,7 @@ if (NOT WINDOWS)
         OUTPUT_VARIABLE OUTPUT
     )
     if (TEST_DIRECT_VFD_WORKS_COMPILE)
-      if (TEST_DIRECT_VFD_WORKS_RUN MATCHES 0)
+      if (TEST_DIRECT_VFD_WORKS_RUN EQUAL "0")
         HDF_FUNCTION_TEST (HAVE_DIRECT)
         set (CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
         add_definitions ("-D_GNU_SOURCE")
@@ -259,9 +259,9 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR)
       message (VERBOSE "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
     endif ()
 
-    if (${COMPILE_RESULT_VAR})
-      if (${RUN_RESULT_VAR} MATCHES 0)
-        set (${RUN_RESULT_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
+    if (COMPILE_RESULT_VAR)
+      if (RUN_RESULT_VAR EQUAL "0")
+        set (${RETURN_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
           message (VERBOSE "Testing C ${FUNCTION_NAME} - OK")
         endif ()
@@ -273,7 +273,7 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR)
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
           message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail")
         endif ()
-        set (${RUN_RESULT_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
+        set (${RETURN_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}")
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
             "Determining if the C ${FUNCTION_NAME} exists failed with the following output:\n"
             "${OUTPUT_VAR}\n\n")
@@ -318,7 +318,7 @@ message (STATUS "Testing maximum decimal precision for C - ${PROG_OUTPUT4}")
 list (GET PROG_OUTPUT4 0 H5_LDBL_DIG)
 list (GET PROG_OUTPUT4 1 H5_FLT128_DIG)
 
-if (${HDF_PREFIX}_SIZEOF___FLOAT128 EQUAL 0 OR FLT128_DIG EQUAL 0)
+if (${HDF_PREFIX}_SIZEOF___FLOAT128 EQUAL "0" OR FLT128_DIG EQUAL "0")
   set (${HDF_PREFIX}_HAVE_FLOAT128 0)
   set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
   set (_PAC_C_MAX_REAL_PRECISION ${H5_LDBL_DIG})
@@ -344,7 +344,7 @@ macro (H5ConversionTests TEST msg)
         OUTPUT_VARIABLE OUTPUT
     )
     if (${TEST}_COMPILE)
-      if (${TEST}_RUN MATCHES 0)
+      if (${TEST}_RUN EQUAL "0")
         set (${TEST} 1 CACHE INTERNAL ${msg})
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
           message (VERBOSE "${msg}... yes")
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 5a94be3..04c0c9f 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -271,6 +271,9 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #cmakedefine H5_HAVE_PTHREAD_H @H5_HAVE_PTHREAD_H@
 
+/* Define to 1 if you have the <pwd.h> header file. */
+#cmakedefine H5_HAVE_PWD_H @H5_HAVE_PWD_H@
+
 /* Define to 1 if you have the <quadmath.h> header file. */
 #cmakedefine H5_HAVE_QUADMATH_H @H5_HAVE_QUADMATH_H@
 
@@ -631,6 +634,12 @@
    PTHREAD_SCOPE_SYSTEM) call. */
 #cmakedefine H5_SYSTEM_SCOPE_THREADS @H5_SYSTEM_SCOPE_THREADS@
 
+/* Define using v1.6 public API symbols by default */
+#cmakedefine H5_USE_16_API_DEFAULT @H5_USE_16_API_DEFAULT@
+
+/* Define using v1.8 public API symbols by default */
+#cmakedefine H5_USE_18_API_DEFAULT @H5_USE_18_API_DEFAULT@
+
 /* Define using v1.10 public API symbols by default */
 #cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@
 
@@ -640,12 +649,6 @@
 /* Define using v1.14 public API symbols by default */
 #cmakedefine H5_USE_114_API_DEFAULT @H5_USE_114_API_DEFAULT@
 
-/* Define using v1.6 public API symbols by default */
-#cmakedefine H5_USE_16_API_DEFAULT @H5_USE_16_API_DEFAULT@
-
-/* Define using v1.8 public API symbols by default */
-#cmakedefine H5_USE_18_API_DEFAULT @H5_USE_18_API_DEFAULT@
-
 /* Define if the library will use file locking */
 #cmakedefine H5_USE_FILE_LOCKING @H5_USE_FILE_LOCKING@
 
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in
index 3eea743..d77e2df 100644
--- a/config/cmake/HDF5_Examples.cmake.in
+++ b/config/cmake/HDF5_Examples.cmake.in
@@ -77,7 +77,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDN
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.14.1-Source")
+#  set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.14.3-Source")
 #endif()
 
 ###############################################################################################################
diff --git a/config/cmake/HDF5_Examples_options.cmake b/config/cmake/HDF5_Examples_options.cmake
index b639b19..cdd49eb 100644
--- a/config/cmake/HDF5_Examples_options.cmake
+++ b/config/cmake/HDF5_Examples_options.cmake
@@ -42,19 +42,24 @@
 ### enable JAVA builds
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=ON")
 
+#############################################################################################
 ### enable FILTERS builds
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FILTERS:BOOL=ON")
+### default HDF5_PLUGIN_PATH to where the filter libraries are located
+#set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin")
 
 #############################################################################################
 ### enable parallel program builds
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_PARALLEL:BOOL=ON")
 
+#############################################################################################
+### match the hdf5 library namespace
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NAMESPACE:STRING=hdf5::")
 
 #############################################################################################
 ### enable threadsafe program builds
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_THREADSAFE:BOOL=ON")
 
-
 #############################################################################################
 ### enable test program builds, requires reference files in testfiles subdirectory
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=ON")
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index bd14a0d..a121d0a 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -9,17 +9,49 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-set(CMAKE_CXX_EXTENSIONS OFF)
+ENABLE_LANGUAGE (CXX)
+
+set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
+set (CMAKE_CXX_EXTENSIONS OFF)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-  message (VERBOSE "Warnings Configuration: CXX default:  ${CMAKE_CXX_FLAGS}")
+  message (VERBOSE "Warnings Configuration: CXX default: ${CMAKE_CXX_FLAGS}")
 endif ()
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
+if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  set (_INTEL_WINDOWS 1)
+endif ()
+
+if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
+   AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+  set (_CLANG_MSVC_WINDOWS 1)
+endif()
+
+# MSVC 14.28 enables C5105, but the Windows SDK 10.0.18362.0 triggers it.
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_LOADED)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd5105")
+  endif ()
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND CMAKE_CXX_COMPILER_LOADED)
+  if (NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+      if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD EQUAL 98)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+      endif ()
+    else ()
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+    endif ()
+  endif ()
+endif ()
+
 if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
   set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
   if (${HDF_CFG_NAME} MATCHES "Debug")
@@ -71,163 +103,167 @@ endif ()
 # HDF5 library compile options
 #-----------------------------------------------------------------------------
 
-if (NOT MSVC AND NOT MINGW)
-  if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    list (APPEND HDF5_CMAKE_CXX_FLAGS "-erroff=%none -DBSD_COMP")
-  else ()
-    # General flags
-    #
-    # Note that some of the flags listed here really should be developer
-    # flags (listed in a separate variable, below) but we put them here
-    # because they are not raised by the current code and we'd like to
-    # know if they do start showing up.
-    #
-    # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
-    # warnings that are emitted. If you need it, add it at configure time.
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  list (APPEND HDF5_CMAKE_CXX_FLAGS "-erroff=%none -DBSD_COMP")
+else ()
+  # General flags
+  #
+  # Note that some of the flags listed here really should be developer
+  # flags (listed in a separate variable, below) but we put them here
+  # because they are not raised by the current code and we'd like to
+  # know if they do start showing up.
+  #
+  # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+  # warnings that are emitted. If you need it, add it at configure time.
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-general")
+    else ()
       ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/general")
+    endif()
+    if (NOT _INTEL_WINDOWS)
       if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
         ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/15")
       endif()
       if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
         ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/18")
       endif()
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED
-          AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-        # add the general CXX flags for g++ compiler versions 4.8 and above.
-        ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
-        if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-          ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
-        else ()
-          ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-general")
-        endif ()
+    endif()
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED
+        AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+      # add the general CXX flags for g++ compiler versions 4.8 and above.
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
+      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
+      else ()
+        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-general")
       endif ()
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
-      list (APPEND HDF5_CMAKE_CXX_FLAGS "-Minform=inform")
-    endif ()
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-      message (VERBOSE "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
     endif ()
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+    list (APPEND HDF5_CMAKE_CXX_FLAGS "-Minform=inform")
   endif ()
-
-  #-----------------------------------------------------------------------------
-  # Option to allow the user to enable developer warnings
-  # Developer warnings (suggestions from gcc, not code problems)
-  #-----------------------------------------------------------------------------
-  if (HDF5_ENABLE_DEV_WARNINGS)
-    message (STATUS "....HDF5 developer group warnings are enabled")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
-    endif ()
-  else ()
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
-    endif ()
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
   endif ()
+endif ()
 
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable developer warnings
+# Developer warnings (suggestions from gcc, not code problems)
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_DEV_WARNINGS)
+  message (STATUS "....HDF5 developer group warnings are enabled")
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
+  endif ()
+else ()
   if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... Only needed for gcc 4.X
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
-    endif ()
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
+  endif ()
+endif ()
 
-    # Append more extra warning flags that only gcc 4.8+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
-      else ()
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
-      endif ()
-    endif ()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  # Technically, variable-length arrays are part of the C99 standard, but
+  #   we should approach them a bit cautiously... Only needed for gcc 4.X
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
+  endif ()
 
-    # Append more extra warning flags that only gcc 4.9+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+  # Append more extra warning flags that only gcc 4.8+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
       # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.9")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
+    else ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 5.1+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
-      # autotools always add the C flags with the CXX flags
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
-      else ()
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-5")
-      endif ()
-    endif ()
+  # Append more extra warning flags that only gcc 4.9+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 6.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  # Append more extra warning flags that only gcc 5.1+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+    # autotools always add the C flags with the CXX flags
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
+    else ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-5")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 7.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXxFLAGS2 "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-      # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
-      endif ()
-    endif ()
+  # Append more extra warning flags that only gcc 6.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  endif ()
 
-    # Append more extra warning flags that only gcc 8.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
-      else ()
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-8")
-      endif ()
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
-      else ()
-        # autotools always add the C flags with the CXX flags
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
-      endif ()
+  # Append more extra warning flags that only gcc 7.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXxFLAGS2 "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+    # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 9.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+  # Append more extra warning flags that only gcc 8.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+    else ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-8")
+    endif ()
+    if (HDF5_ENABLE_DEV_WARNINGS)
       # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-9")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
+    else ()
+      # autotools always add the C flags with the CXX flags
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 9.3+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3)
-      # do not use C warnings, gnu-warnings 9.3, no cxx warniings
-      # ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
-    endif ()
+  # Append more extra warning flags that only gcc 9.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 10.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
-      endif ()
+  # Append more extra warning flags that only gcc 9.3+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3)
+    # do not use C warnings, gnu-warnings 9.3, no cxx warniings
+    # ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
+  endif ()
+
+  # Append more extra warning flags that only gcc 10.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
     endif ()
   endif ()
 endif ()
@@ -269,17 +305,17 @@ endif ()
 # This option will force/override the default setting for all configurations
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
-  if(CMAKE_CXX_COMPILER_LOADED)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  if (CMAKE_CXX_COMPILER_LOADED)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
     endif ()
   endif ()
 elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
-  if(CMAKE_CXX_COMPILER_LOADED)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wl,-s")
+  if (CMAKE_CXX_COMPILER_LOADED)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-s")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
     endif ()
@@ -291,7 +327,7 @@ endif ()
 # This option will force/override the default setting for all configurations
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_PROFILING)
-  if(CMAKE_CXX_COMPILER_LOADED)
+  if (CMAKE_CXX_COMPILER_LOADED)
     list (APPEND HDF5_CMAKE_CXX_FLAGS "${PROFILE_CXXFLAGS}")
   endif ()
 endif ()
@@ -301,7 +337,7 @@ endif ()
 # This option will force/override the default setting for all configurations
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_OPTIMIZATION)
-  if(CMAKE_CXX_COMPILER_LOADED)
+  if (CMAKE_CXX_COMPILER_LOADED)
     list (APPEND HDF5_CMAKE_CXX_FLAGS "${OPTIMIZE_CXXFLAGS}")
   endif ()
 endif ()
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index e38a92b..de5b563 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -14,14 +14,43 @@ set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
 set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
 set (CMAKE_C_FLAGS "${CMAKE_C_SANITIZER_FLAGS} ${CMAKE_C_FLAGS}")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
-
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-  message (VERBOSE "Warnings Configuration: default: ${CMAKE_C_FLAGS} : ${CMAKE_CXX_FLAGS}")
+  message (VERBOSE "Warnings Configuration: C default: ${CMAKE_C_FLAGS}")
 endif ()
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  set(_INTEL_WINDOWS 1)
+endif()
+
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Clang"
+   AND "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
+  set(_CLANG_MSVC_WINDOWS 1)
+endif()
+
+# Disable deprecation warnings for standard C functions.
+# really only needed for newer versions of VS, but should
+# not hurt other versions, and this will work into the
+# future
+if(MSVC OR _INTEL_WINDOWS OR _CLANG_MSVC_WINDOWS)
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+else()
+endif()
+
+if(MSVC)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stack:10000000")
+endif()
+
+# MSVC 14.28 enables C5105, but the Windows SDK 10.0.18362.0 triggers it.
+if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 19.28)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd5105")
+endif()
+
+if(_CLANG_MSVC_WINDOWS AND "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker -stack:20000000")
+endif()
+
 if (CMAKE_COMPILER_IS_GNUCC)
   set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
   if (${HDF_CFG_NAME} MATCHES "Debug")
@@ -81,33 +110,37 @@ endif ()
 # HDF5 library compile options
 #-----------------------------------------------------------------------------
 
-if (NOT MSVC AND NOT MINGW)
-  #-----------------------------------------------------------------------------
-  # Option to allow the user to interpret certain warnings as errors
-  #
-  # This should NOT be on by default as it can cause a lot of conflicts with
-  # new operating systems and compiler versions. Header files that are out of
-  # our control (MPI, HDFS, etc.) can also raise warnings.
-  #-----------------------------------------------------------------------------
-  option (HDF5_ENABLE_WARNINGS_AS_ERRORS "Interpret some warnings as errors" OFF)
-  if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-    message (STATUS "...some warnings will be interpreted as errors")
-  endif ()
+#-----------------------------------------------------------------------------
+# Option to allow the user to interpret certain warnings as errors
+#
+# This should NOT be on by default as it can cause a lot of conflicts with
+# new operating systems and compiler versions. Header files that are out of
+# our control (MPI, HDFS, etc.) can also raise warnings.
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_WARNINGS_AS_ERRORS "Interpret some warnings as errors" OFF)
+if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+  message (STATUS "...some warnings will be interpreted as errors")
+endif ()
 
-  if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    list (APPEND HDF5_CMAKE_C_FLAGS "-erroff=%none -DBSD_COMP")
-  else ()
-    # General flags
-    #
-    # Note that some of the flags listed here really should be developer
-    # flags (listed in a separate variable, below) but we put them here
-    # because they are not raised by the current code and we'd like to
-    # know if they do start showing up.
-    #
-    # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
-    # warnings that are emitted. If you need it, add it at configure time.
-    if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  list (APPEND HDF5_CMAKE_C_FLAGS "-erroff=%none -DBSD_COMP")
+else ()
+  # General flags
+  #
+  # Note that some of the flags listed here really should be developer
+  # flags (listed in a separate variable, below) but we put them here
+  # because they are not raised by the current code and we'd like to
+  # know if they do start showing up.
+  #
+  # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+  # warnings that are emitted. If you need it, add it at configure time.
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-general")
+    else ()
       ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/general")
+    endif()
+    if (NOT _INTEL_WINDOWS)
       if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0)
         ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/15")
       endif()
@@ -116,133 +149,137 @@ if (NOT MSVC AND NOT MINGW)
       if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 18.0)
         ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/18")
       endif()
-    elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-      # Add general CFlags for GCC versions 4.8 and above
-      if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-        ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
-        if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-          ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
-        else ()
-          ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-general")
-        endif ()
-      endif ()
-      # gcc automatically inlines based on the optimization level
-      # this is just a failsafe
-      list (APPEND H5_CFLAGS "-finline-functions")
-    elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
+    endif()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    # Add general CFlags for GCC versions 4.8 and above
+    if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
       if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
+        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
       else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/noerror-general")
+        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-general")
       endif ()
-    elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
-      list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
     endif ()
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-      message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
+    # gcc automatically inlines based on the optimization level
+    # this is just a failsafe
+    list (APPEND H5_CFLAGS "-finline-functions")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/noerror-general")
     endif ()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
+    list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
   endif ()
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
+  endif ()
+endif ()
 
-  #-----------------------------------------------------------------------------
-  # Option to allow the user to enable developer warnings
-  # Developer warnings (suggestions from gcc, not code problems)
-  #-----------------------------------------------------------------------------
-  option (HDF5_ENABLE_DEV_WARNINGS "Enable HDF5 developer group warnings" OFF)
-  if (HDF5_ENABLE_DEV_WARNINGS)
-    message (STATUS "....HDF5 developer group warnings are enabled")
-    if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable developer warnings
+# Developer warnings (suggestions from gcc, not code problems)
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_DEV_WARNINGS "Enable HDF5 developer group warnings" OFF)
+if (HDF5_ENABLE_DEV_WARNINGS)
+  message (STATUS "....HDF5 developer group warnings are enabled")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-developer-general")
+    else ()
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
-    elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
-    elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
-    endif ()
-  else ()
-    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
-    elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
     endif ()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
   endif ()
+else ()
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
+  endif ()
+endif ()
 
-  if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... Only needed for gcc 4.X
-    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
-    endif ()
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  # Technically, variable-length arrays are part of the C99 standard, but
+  #   we should approach them a bit cautiously... Only needed for gcc 4.X
+  if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
+  endif ()
 
-    # Append more extra warning flags that only gcc 4.8+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
-      else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
-      endif ()
+  # Append more extra warning flags that only gcc 4.8+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 4.9+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
-    endif ()
+  # Append more extra warning flags that only gcc 4.9+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 5.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
-      else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
-      endif ()
+  # Append more extra warning flags that only gcc 5.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 6.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
-    endif ()
+  # Append more extra warning flags that only gcc 6.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  endif ()
 
-    # Append more extra warning flags that only gcc 7.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
-      endif ()
+  # Append more extra warning flags that only gcc 7.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 8.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
-      endif ()
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
-      else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
-      endif ()
+  # Append more extra warning flags that only gcc 8.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
     endif ()
-
-    # Append more extra warning flags that only gcc 9.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 9.3+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
-    endif ()
+  # Append more extra warning flags that only gcc 9.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 10.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
-      endif ()
+  # Append more extra warning flags that only gcc 9.3+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
+  endif ()
+
+  # Append more extra warning flags that only gcc 10.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
     endif ()
   endif ()
 endif ()
@@ -297,13 +334,13 @@ MARK_AS_ADVANCED (HDF5_ENABLE_ASSERTS)
 set (HDF5_ENABLE_SYMBOLS "OFF" CACHE STRING "Add debug symbols to the library independent of the build mode and optimization level (OFF NO YES)")
 set_property (CACHE HDF5_ENABLE_SYMBOLS PROPERTY STRINGS OFF NO YES)
 if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
-  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
   elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fno-omit-frame-pointer")
   endif ()
 elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
-  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-s")
   elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s")
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 08e38e8..8df7dd4 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -11,7 +11,7 @@
 #
 #############################################################################################
 ### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE                                       ###
-### BUILD_GENERATOR required [Unix, VS2017, VS201764, VS2015, VS201564, VS2013, VS201364] ###
+### BUILD_GENERATOR required [Unix, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564] ###
 ### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf5.log         ###
 #############################################################################################
 
@@ -68,7 +68,7 @@ endif ()
 
 # build generator must be defined
 if (NOT DEFINED BUILD_GENERATOR)
-  message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
+  message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2019, VS201964, VS2017, or VS201764, VS2015, VS201564")
 endif ()
 
 ###################################################################
@@ -163,7 +163,7 @@ if (NOT DEFINED HPC)
       set (SITE_COMPILER_NAME "vs2012")
       set (SITE_COMPILER_VERSION "11")
     else ()
-      message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
+      message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2019, VS201964, VS2017, or VS201764, VS2015, VS201564")
     endif ()
   ##  Set the following to unique id your computer  ##
     set (CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX")
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index 7133e6c..8a152d1 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -69,7 +69,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
 
 ####      package examples       ####
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-1.14.1-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-1.14.3-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
 
 #############################################################################################
 ### enable parallel builds
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index 27c7045..1dd1440 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -115,7 +115,7 @@ CHECK_INCLUDE_FILE_CONCAT ("sys/types.h"     ${HDF_PREFIX}_HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE_CONCAT ("features.h"      ${HDF_PREFIX}_HAVE_FEATURES_H)
 CHECK_INCLUDE_FILE_CONCAT ("dirent.h"        ${HDF_PREFIX}_HAVE_DIRENT_H)
 CHECK_INCLUDE_FILE_CONCAT ("unistd.h"        ${HDF_PREFIX}_HAVE_UNISTD_H)
-
+CHECK_INCLUDE_FILE_CONCAT ("pwd.h"           ${HDF_PREFIX}_HAVE_PWD_H)
 CHECK_INCLUDE_FILE_CONCAT ("globus/common.h" ${HDF_PREFIX}_HAVE_GLOBUS_COMMON_H)
 CHECK_INCLUDE_FILE_CONCAT ("pdb.h"           ${HDF_PREFIX}_HAVE_PDB_H)
 CHECK_INCLUDE_FILE_CONCAT ("pthread.h"       ${HDF_PREFIX}_HAVE_PTHREAD_H)
diff --git a/config/intel-warnings/18 b/config/intel-warnings/18
index 565b47a..02bcdea 100644
--- a/config/intel-warnings/18
+++ b/config/intel-warnings/18
@@ -1,8 +1,2 @@
--Wextra-tokens
--Wformat
--Wformat-security
 -Wic-pointer
--Wshadow
 -Wsign-compare
--Wtrigraphs
--Wwrite-strings
diff --git a/config/intel-warnings/general-19 b/config/intel-warnings/general-19
deleted file mode 100644
index e35af30..0000000
--- a/config/intel-warnings/general-19
+++ /dev/null
@@ -1,2 +0,0 @@
-# this is only available before oneapi versions
--Wcheck
diff --git a/config/intel-warnings/win-developer-general b/config/intel-warnings/win-developer-general
new file mode 100644
index 0000000..6cd7ed7
--- /dev/null
+++ b/config/intel-warnings/win-developer-general
@@ -0,0 +1 @@
+/Wport
diff --git a/config/intel-warnings/win-general b/config/intel-warnings/win-general
new file mode 100644
index 0000000..ef54b2b
--- /dev/null
+++ b/config/intel-warnings/win-general
@@ -0,0 +1 @@
+/Wall
diff --git a/config/sanitizer/sanitizers.cmake b/config/sanitizer/sanitizers.cmake
index 0803279..58c4050 100644
--- a/config/sanitizer/sanitizers.cmake
+++ b/config/sanitizer/sanitizers.cmake
@@ -33,10 +33,10 @@ if(USE_SANITIZER)
   if(INTEL_CLANG OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
     set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-    append("-fno-omit-frame-pointer" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
-    message(STATUS "Building with sanitize, base flags=${CMAKE_C_SANITIZER_FLAGS}")
-
     if(UNIX)
+      append("-fno-omit-frame-pointer" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+      message(STATUS "Building with sanitize, base flags=${CMAKE_C_SANITIZER_FLAGS}")
+
       if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
         append("-O1" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
       endif()
@@ -83,7 +83,7 @@ if(USE_SANITIZER)
     elseif(MSVC)
       if(USE_SANITIZER MATCHES "([Aa]ddress)")
         message(STATUS "Building with Address sanitizer")
-        append("-fsanitize=address" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
+        append("/fsanitize=address" CMAKE_C_SANITIZER_FLAGS CMAKE_CXX_SANITIZER_FLAGS)
       else()
         message(FATAL_ERROR "This sanitizer not yet supported in the MSVC environment: ${USE_SANITIZER}")
       endif()
diff --git a/config/toolchain/clang.cmake b/config/toolchain/clang.cmake
index 5e3b13a..af176aa 100644
--- a/config/toolchain/clang.cmake
+++ b/config/toolchain/clang.cmake
@@ -3,8 +3,13 @@
 
 set(CMAKE_COMPILER_VENDOR "clang")
 
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
+if(WIN32)
+  set(CMAKE_C_COMPILER clang-cl)
+  set(CMAKE_CXX_COMPILER clang-cl)
+else()
+  set(CMAKE_C_COMPILER clang)
+  set(CMAKE_CXX_COMPILER clang++)
+endif()
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # the following is used if cross-compiling
diff --git a/configure.ac b/configure.ac
index 55ea12c..258f96c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1225,7 +1225,7 @@ AC_CHECK_LIB([dl], [dlopen])
 ##
 
 ## Unix
-AC_CHECK_HEADERS([dirent.h features.h unistd.h])
+AC_CHECK_HEADERS([dirent.h features.h pwd.h unistd.h])
 AC_CHECK_HEADERS([sys/file.h sys/ioctl.h sys/resource.h])
 AC_CHECK_HEADERS([sys/stat.h sys/time.h sys/types.h])
 
@@ -4019,6 +4019,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  tools/test/misc/vds/Makefile
                  tools/test/h5stat/Makefile
                  tools/test/h5stat/testh5stat.sh
+                 tools/src/h5perf/Makefile
                  tools/test/perform/Makefile
                  examples/Makefile
                  examples/run-c-ex.sh
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index b422078..70142c8 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -98,11 +98,14 @@ endif ()
 
 ### Windows pops up a modal permission dialog on this test
 if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND NOT WIN32)
+  # Ensure that 24 is a multiple of the number of processes.
+  # The number 24 corresponds to SPACE1_DIM1 and SPACE1_DIM2 defined in ph5example.c
+  math(EXPR NUMPROCS "24 / ((24 + ${MPIEXEC_MAX_NUMPROCS} - 1) / ${MPIEXEC_MAX_NUMPROCS})")
   if (HDF5_ENABLE_USING_MEMCHECKER)
-    add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
+    add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5example> ${MPIEXEC_POSTFLAGS})
   else ()
     add_test (NAME MPI_TEST_EXAMPLES-ph5example COMMAND "${CMAKE_COMMAND}"
-        -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
+        -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5example>;${MPIEXEC_POSTFLAGS}"
         -D "TEST_ARGS:STRING="
         -D "TEST_EXPECT=0"
         -D "TEST_OUTPUT=ph5example.out"
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index e59a829..316d3c7 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -582,4 +582,17 @@ if (NOT WIN32 AND NOT MINGW)
       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
       COMPONENT fortlibraries
   )
+  if (HDF5_ENABLE_PARALLEL AND MPI_Fortran_FOUND)
+    configure_file (
+        ${HDF_RESOURCES_DIR}/libh5cc.in
+        ${HDF5_BINARY_DIR}/CMakeFiles/h5pfc
+        @ONLY
+    )
+    install (
+        FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5pfc
+        DESTINATION ${HDF5_INSTALL_BIN_DIR}
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+        COMPONENT fortlibraries
+    )
+  endif ()
 endif ()
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
index f772558..a273431 100644
--- a/fortran/src/H5Fff.F90
+++ b/fortran/src/H5Fff.F90
@@ -824,7 +824,7 @@ CONTAINS
   SUBROUTINE h5fget_name_f(obj_id, buf, size, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: obj_id   ! Object identifier
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf
+    CHARACTER(LEN=*), INTENT(OUT) :: buf
                                            ! Buffer to hold file name
     INTEGER(SIZE_T), INTENT(OUT) :: size   ! Size of the file name
     INTEGER, INTENT(OUT) :: hdferr         ! Error code: 0 on success,
@@ -844,7 +844,7 @@ CONTAINS
          CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
        END FUNCTION h5fget_name_c
     END INTERFACE
-    buflen = LEN_TRIM(buf)
+    buflen = LEN(buf)
     hdferr = h5fget_name_c(obj_id, size, buf, buflen)
   END SUBROUTINE h5fget_name_f
 !****s* H5F/h5fget_filesize_f
diff --git a/fortran/test/fortranlib_test.F90 b/fortran/test/fortranlib_test.F90
index eff4657..1640a8f 100644
--- a/fortran/test/fortranlib_test.F90
+++ b/fortran/test/fortranlib_test.F90
@@ -74,6 +74,10 @@ PROGRAM fortranlibtest
   CALL write_test_status(ret_total_error, ' Reopen test', total_error)
 
   ret_total_error = 0
+  CALL get_name_test(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Get name test', total_error)
+
+  ret_total_error = 0
   CALL file_close(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' File open/close test', total_error)
 
diff --git a/fortran/test/tH5F.F90 b/fortran/test/tH5F.F90
index f4a3232..06dc6de 100644
--- a/fortran/test/tH5F.F90
+++ b/fortran/test/tH5F.F90
@@ -21,7 +21,8 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! CONTAINS SUBROUTINES
-!  mountingtest, reopentest, plisttest, file_close, file_space
+!  mountingtest, reopentest, get_name_test, plisttest, 
+!  file_close, file_space
 !
 !*****
 !
@@ -580,6 +581,125 @@ CONTAINS
 
         END SUBROUTINE reopentest
 
+!    The following subroutine checks that h5fget_name_f produces
+!    correct output for a given obj_id and filename.
+!
+        SUBROUTINE check_get_name(obj_id, fix_filename, total_error)
+          USE HDF5  ! This module contains all necessary modules
+          USE TH5_MISC
+          IMPLICIT NONE
+          INTEGER(HID_T) :: obj_id                          ! Object identifier
+          CHARACTER(LEN=80), INTENT(IN) :: fix_filename     ! Expected filename
+          INTEGER, INTENT(INOUT) :: total_error             ! Error count
+
+          CHARACTER(LEN=80):: file_name  ! Filename buffer
+          INTEGER:: error                ! HDF5 error code
+          INTEGER(SIZE_T):: name_size    ! Filename length
+          !
+          !Get file name from the dataset identifier
+          !
+
+          ! Use an uninitialized buffer
+          CALL h5fget_name_f(obj_id, file_name, name_size, error)
+          CALL check("h5fget_name_f",error,total_error)
+          IF(name_size .NE. LEN_TRIM(fix_filename))THEN
+             WRITE(*,*) "  file name size obtained from the object id is incorrect"
+             total_error = total_error + 1
+          ENDIF
+          IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
+             WRITE(*,*) "  file name obtained from the object id is incorrect"
+             total_error = total_error + 1
+          END IF
+
+         ! Use a buffer initialized with spaces
+         file_name(:) = " "
+         CALL h5fget_name_f(obj_id, file_name, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. LEN_TRIM(fix_filename))THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+         ! Use a buffer initialized with non-whitespace characters
+         file_name(:) = "a"
+         CALL h5fget_name_f(obj_id, file_name, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. LEN_TRIM(fix_filename))THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(file_name(1:name_size) .NE. TRIM(fix_filename)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+        END SUBROUTINE check_get_name
+
+!    The following subroutine tests h5fget_name_f.
+!    It creates the file which has name "filename.h5" and
+!    tests that h5fget_name_f also returns the name "filename.h5"
+!
+
+        SUBROUTINE get_name_test(cleanup, total_error)
+          USE HDF5  ! This module contains all necessary modules
+          USE TH5_MISC
+          IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
+          INTEGER, INTENT(INOUT) :: total_error
+
+          CHARACTER(LEN=*), PARAMETER :: filename = "filename"
+          CHARACTER(LEN=80)  :: fix_filename
+
+          INTEGER(HID_T) :: file_id          ! File identifier
+          INTEGER(HID_T) :: g_id             ! Group identifier
+
+          !
+          ! Flag to check operation success
+          !
+          INTEGER :: error
+
+          !
+          ! Create file "filename.h5" using default properties.
+          !
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          IF (error .NE. 0) THEN
+             WRITE(*,*) "Cannot modify filename"
+             STOP
+          ENDIF
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+          CALL check("h5fcreate_f",error,total_error)
+
+          !
+          ! Create group.
+          !
+          CALL h5gopen_f(file_id,"/",g_id, error)
+          CALL check("h5gopen_f",error,total_error)
+
+          CALL check_get_name(file_id, fix_filename, total_error)
+          CALL check_get_name(g_id, fix_filename, total_error)
+
+          ! Close the group.
+          !
+          CALL h5gclose_f(g_id, error)
+          CALL check("h5gclose_f",error,total_error)
+
+          !
+          ! Close the file identifiers.
+          !
+          CALL h5fclose_f(file_id, error)
+          CALL check("h5fclose_f",error,total_error)
+
+          IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+          CALL check("h5_cleanup_f", error, total_error)
+          RETURN
+
+        END SUBROUTINE get_name_test
+
+
 !
 !    The following example demonstrates how to get creation property list,
 !    and access property list.
diff --git a/fortran/test/tH5Z.F90 b/fortran/test/tH5Z.F90
index 0eaa941..8c39fea 100644
--- a/fortran/test/tH5Z.F90
+++ b/fortran/test/tH5Z.F90
@@ -192,7 +192,8 @@ CONTAINS
           INTEGER(HSIZE_T), DIMENSION(2) :: chunk_dims = (/NN, MM/)
           INTEGER     ::   rank = 2                        ! Dataset rank
 
-          INTEGER, DIMENSION(N,M) :: dset_data, data_out ! Data buffers
+          INTEGER, DIMENSION(N,M) :: dset_data ! Data buffers
+          INTEGER, DIMENSION(:,:), ALLOCATABLE :: data_out ! Data buffers
           INTEGER     ::   error ! Error flag
           INTEGER     ::   num_errors = 0 ! Number of data errors
 
@@ -363,8 +364,9 @@ CONTAINS
           !
           ! Read the dataset.
           !
+          ALLOCATE(data_out(1:N,1:M))
           CALL h5dread_f (dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
-              CALL check("h5dread_f", error, total_error)
+          CALL check("h5dread_f", error, total_error)
 
           !
           !Compare the data.
@@ -385,6 +387,7 @@ CONTAINS
 100       IF (num_errors .GT. 0) THEN
             total_error=total_error + 1
           END IF
+          DEALLOCATE(data_out)
 
           !
           ! End access to the dataset and release resources used by it.
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index 2908626..086c702 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -62,12 +62,9 @@ PacketTable::~PacketTable()
  * any trouble making or opening the packet table.
  */
 bool
-PacketTable::IsValid()
+PacketTable::IsValid() const
 {
-    if (H5PTis_valid(table_id) == 0)
-        return true;
-    else
-        return false;
+    return H5PTis_valid(table_id) == 0;
 }
 
 /* IsVariableLength
@@ -75,7 +72,7 @@ PacketTable::IsValid()
  * and 0, otherwise.  Returns -1 if the table is invalid (not open).
  */
 int
-PacketTable::IsVariableLength()
+PacketTable::IsVariableLength() const
 {
     return H5PTis_varlen(table_id);
 }
@@ -84,7 +81,7 @@ PacketTable::IsVariableLength()
  * Sets the index to point to the first packet in the packet table
  */
 void
-PacketTable::ResetIndex()
+PacketTable::ResetIndex() const
 {
     H5PTcreate_index(table_id);
 }
@@ -94,7 +91,7 @@ PacketTable::ResetIndex()
  * Returns 0 on success, negative on failure (if index is out of bounds)
  */
 int
-PacketTable::SetIndex(hsize_t index)
+PacketTable::SetIndex(hsize_t index) const
 {
     return H5PTset_index(table_id, index);
 }
@@ -104,7 +101,7 @@ PacketTable::SetIndex(hsize_t index)
  * Returns 0 on success, negative on failure (if index is out of bounds)
  */
 hsize_t
-PacketTable::GetIndex(int &error)
+PacketTable::GetIndex(int &error) const
 {
     hsize_t index;
 
@@ -121,7 +118,7 @@ PacketTable::GetIndex(int &error)
  * error is set to negative.
  */
 hsize_t
-PacketTable::GetPacketCount(int &error)
+PacketTable::GetPacketCount(int &error) const
 {
     hsize_t npackets;
 
@@ -133,7 +130,7 @@ PacketTable::GetPacketCount(int &error)
  * Returns the identifier of the packet table
  */
 hid_t
-PacketTable::GetTableId()
+PacketTable::GetTableId() const
 {
     return table_id;
 }
@@ -145,7 +142,7 @@ PacketTable::GetTableId()
  * the desired functionality cannot be performed via the packet table ID.
  */
 hid_t
-PacketTable::GetDatatype()
+PacketTable::GetDatatype() const
 {
     return H5PTget_type(table_id);
 }
@@ -157,7 +154,7 @@ PacketTable::GetDatatype()
  * the desired functionality cannot be performed via the packet table ID.
  */
 hid_t
-PacketTable::GetDataset()
+PacketTable::GetDataset() const
 {
     return H5PTget_dataset(table_id);
 }
@@ -169,7 +166,7 @@ PacketTable::GetDataset()
  * Returns 0 on success, negative on error.
  */
 int
-PacketTable::FreeBuff(size_t numStructs, hvl_t *buffer)
+PacketTable::FreeBuff(size_t numStructs, hvl_t *buffer) const
 {
     return H5PTfree_vlen_buff(table_id, numStructs, buffer);
 }
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index eae66f1..c1f1eb5 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -54,39 +54,39 @@ class H5_HLCPPDLL PacketTable {
      * Use this after the constructor to ensure HDF did not have
      * any trouble making or opening the packet table.
      */
-    bool IsValid();
+    bool IsValid() const;
 
     /* IsVariableLength
      * Return 1 if this packet table uses variable-length datatype,
      * return 0 if it is Fixed Length.  Returns -1 if the table is
      * invalid (not open).
      */
-    int IsVariableLength();
+    int IsVariableLength() const;
 
     /* ResetIndex
      * Sets the "current packet" index to point to the first packet in the
      * packet table
      */
-    void ResetIndex();
+    void ResetIndex() const;
 
     /* SetIndex
      * Sets the current packet to point to the packet specified by index.
      * Returns 0 on success, negative on failure (if index is out of bounds)
      */
-    int SetIndex(hsize_t index);
+    int SetIndex(hsize_t index) const;
 
     /* GetIndex
      * Returns the position of the current packet.
      * On failure, returns 0 and error is set to negative.
      */
-    hsize_t GetIndex(int &error);
+    hsize_t GetIndex(int &error) const;
 
     /* GetPacketCount
      * Returns the number of packets in the packet table.  Error
      * is set to 0 on success.  On failure, returns 0 and
      * error is set to negative.
      */
-    hsize_t GetPacketCount(int &error);
+    hsize_t GetPacketCount(int &error) const;
 
     hsize_t
     GetPacketCount()
@@ -98,7 +98,7 @@ class H5_HLCPPDLL PacketTable {
     /* GetTableId
      * Returns the identifier of the packet table.
      */
-    hid_t GetTableId();
+    hid_t GetTableId() const;
 
     /* GetDatatype
      * Returns the datatype identifier used by the packet table, on success,
@@ -106,7 +106,7 @@ class H5_HLCPPDLL PacketTable {
      * Note: it is best to avoid using this identifier in applications, unless
      * the desired functionality cannot be performed via the packet table ID.
      */
-    hid_t GetDatatype();
+    hid_t GetDatatype() const;
 
     /* GetDataset
      * Returns the dataset identifier associated with the packet table, on
@@ -114,7 +114,7 @@ class H5_HLCPPDLL PacketTable {
      * Note: it is best to avoid using this identifier in applications, unless
      * the desired functionality cannot be performed via the packet table ID.
      */
-    hid_t GetDataset();
+    hid_t GetDataset() const;
 
     /* FreeBuff
      * Frees the buffers created when variable-length packets are read.
@@ -122,7 +122,7 @@ class H5_HLCPPDLL PacketTable {
      * location in memory.
      * Returns 0 on success, negative on error.
      */
-    int FreeBuff(size_t numStructs, hvl_t *buffer);
+    int FreeBuff(size_t numStructs, hvl_t *buffer) const;
 
   protected:
     hid_t table_id;
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index 6deb24d..ab49303 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -620,7 +620,7 @@ TestHDFFV_9758()
 
     for (hsize_t i = 0; i < NUM_PACKETS; i++) {
         s1[i].a = static_cast<int>(i);
-        s1[i].b = 1.0f * static_cast<float>(i * i);
+        s1[i].b = 1.0F * static_cast<float>(i * i);
         s1[i].c = 1.0 / static_cast<double>(i + 1);
         HDsprintf(s1[i].d, "string%" PRIuHSIZE "", i);
         s1[i].e = static_cast<int>(100 + i);
diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c
index 8635acf..3294ef4 100644
--- a/hl/examples/ex_table_01.c
+++ b/hl/examples/ex_table_01.c
@@ -50,10 +50,10 @@ main(void)
                                  sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
 
     /* Define an array of Particles */
-    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     /* Define field information */
     const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c
index 9c476b3..fb2cad6 100644
--- a/hl/examples/ex_table_02.c
+++ b/hl/examples/ex_table_02.c
@@ -42,10 +42,10 @@ main(void)
     Particle dst_buf[NRECORDS + NRECORDS_ADD];
 
     /* Define an array of Particles */
-    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     /* Calculate the size and the offsets of our struct members in memory */
     size_t dst_size            = sizeof(Particle);
@@ -66,7 +66,7 @@ main(void)
     int         i;
 
     /* Append particles */
-    Particle particle_in[NRECORDS_ADD] = {{"eight", 80, 80, 8.0f, 80.0}, {"nine", 90, 90, 9.0f, 90.0}};
+    Particle particle_in[NRECORDS_ADD] = {{"eight", 80, 80, 8.0F, 80.0}, {"nine", 90, 90, 9.0F, 90.0}};
 
     /* Initialize the field field_type */
     string_type = H5Tcopy(H5T_C_S1);
diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c
index 31cf970..3caa45e 100644
--- a/hl/examples/ex_table_03.c
+++ b/hl/examples/ex_table_03.c
@@ -46,14 +46,14 @@ main(void)
     size_t dst_offset[NFIELDS] = {HOFFSET(Particle, name), HOFFSET(Particle, lati), HOFFSET(Particle, longi),
                                   HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
 
-    Particle p                  = {"zero", 0, 0, 0.0f, 0.0};
+    Particle p                  = {"zero", 0, 0, 0.0F, 0.0};
     size_t   dst_sizes[NFIELDS] = {sizeof(p.name), sizeof(p.lati), sizeof(p.longi), sizeof(p.pressure),
                                  sizeof(p.temperature)};
 
     /* Define field information */
     const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
     /* Fill value particle */
-    Particle fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}};
+    Particle fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}};
     hid_t    field_type[NFIELDS];
     hid_t    string_type;
     hid_t    file_id;
@@ -63,7 +63,7 @@ main(void)
     int      i;
 
     /* Define 2 new particles to write */
-    Particle particle_in[NRECORDS_WRITE] = {{"zero", 0, 0, 0.0f, 0.0}, {"one", 10, 10, 1.0f, 10.0}};
+    Particle particle_in[NRECORDS_WRITE] = {{"zero", 0, 0, 0.0F, 0.0}, {"one", 10, 10, 1.0F, 10.0}};
 
     /* Initialize the field field_type */
     string_type = H5Tcopy(H5T_C_S1);
diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c
index 863fe15..9b39ef7 100644
--- a/hl/examples/ex_table_04.c
+++ b/hl/examples/ex_table_04.c
@@ -65,23 +65,23 @@ main(void)
     hid_t     string_type;
     hid_t     file_id;
     hsize_t   chunk_size   = 10;
-    Particle  fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    Particle  fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
     hsize_t   start;                                               /* Record to start reading/writing */
     hsize_t   nrecords;                                            /* Number of records to read/write */
     int       compress = 0;
     int       i;
     Particle *p_data                    = NULL; /* Initially no data */
     float     pressure_in[NRECORDS_ADD] =       /* Define new values for the field "Pressure"  */
-        {0.0f, 1.0f, 2.0f};
+        {0.0F, 1.0F, 2.0F};
     Position     position_in[NRECORDS_ADD] = {/* Define new values for "Latitude,Longitude"  */
                                           {0, 0},
                                           {10, 10},
                                           {20, 20}};
     NamePressure namepre_in[NRECORDS_ADD]  = /* Define new values for "Name,Pressure"  */
         {
-            {"zero", 0.0f},
-            {"one", 1.0f},
-            {"two", 2.0f},
+            {"zero", 0.0F},
+            {"one", 1.0F},
+            {"two", 2.0F},
         };
     size_t field_sizes_pos[2] = {sizeof(position_in[0].longi), sizeof(position_in[0].lati)};
     size_t field_sizes_pre[1] = {sizeof(namepre_in[0].pressure)};
diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c
index 337bfb6..cac406b 100644
--- a/hl/examples/ex_table_05.c
+++ b/hl/examples/ex_table_05.c
@@ -64,7 +64,7 @@ main(void)
     hid_t       string_type;
     hid_t       file_id;
     hsize_t     chunk_size   = 10;
-    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
     int         compress     = 0;
     hsize_t     nfields;
     hsize_t     start;    /* Record to start reading/writing */
@@ -72,7 +72,7 @@ main(void)
     int         i;
 
     /* Define new values for the field "Pressure"  */
-    float pressure_in[NRECORDS_ADD] = {0.0f, 1.0f, 2.0f};
+    float pressure_in[NRECORDS_ADD] = {0.0F, 1.0F, 2.0F};
     int   field_index_pre[1]        = {3};
     int   field_index_pos[2]        = {1, 2};
 
diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c
index f6b67c8..cc1bc01 100644
--- a/hl/examples/ex_table_06.c
+++ b/hl/examples/ex_table_06.c
@@ -49,7 +49,7 @@ main(void)
     hid_t       string_type;
     hid_t       file_id;
     hsize_t     chunk_size   = 10;
-    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
     int         compress     = 0;
     hsize_t     nfields_out;
     hsize_t     nrecords_out;
diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c
index ab36613..e05a681 100644
--- a/hl/examples/ex_table_07.c
+++ b/hl/examples/ex_table_07.c
@@ -44,10 +44,10 @@ main(void)
                                   HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
 
     /* Define an array of Particles */
-    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     const char *field_names[NFIELDS] = /* Define field information */
         {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
@@ -56,7 +56,7 @@ main(void)
     hid_t    file_id;
     hsize_t  chunk_size   = 10;
     int      compress     = 0;
-    Particle fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}};
+    Particle fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}};
     hsize_t  start;    /* Record to start reading */
     hsize_t  nrecords; /* Number of records to insert/delete */
     hsize_t  nfields_out;
diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c
index 5d447dd..1063172 100644
--- a/hl/examples/ex_table_08.c
+++ b/hl/examples/ex_table_08.c
@@ -41,10 +41,10 @@ main(void)
     Particle dst_buf[NRECORDS + NRECORDS_INS];
 
     /* Define an array of Particles */
-    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     /* Calculate the size and the offsets of our struct members in memory */
     size_t dst_size            = sizeof(Particle);
@@ -54,7 +54,7 @@ main(void)
                                  sizeof(p_data[0].pressure), sizeof(p_data[0].temperature)};
 
     /* Define an array of Particles to insert */
-    Particle p_data_insert[NRECORDS_INS] = {{"new", 30, 30, 3.0f, 30.0}, {"new", 40, 40, 4.0f, 40.0}};
+    Particle p_data_insert[NRECORDS_INS] = {{"new", 30, 30, 3.0F, 30.0}, {"new", 40, 40, 4.0F, 40.0}};
 
     /* Define field information */
     const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c
index 381925f..171de2e 100644
--- a/hl/examples/ex_table_09.c
+++ b/hl/examples/ex_table_09.c
@@ -49,10 +49,10 @@ main(void)
                                  sizeof(dst_buf[0].pressure), sizeof(dst_buf[0].temperature)};
 
     /* Define an array of Particles */
-    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     /* Define field information */
     const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
@@ -61,7 +61,7 @@ main(void)
     hid_t       file_id;
     hsize_t     chunk_size   = 10;
     int         compress     = 0;
-    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}}; /* Fill value particle */
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}}; /* Fill value particle */
     hsize_t     start1;   /* Record to start reading from 1st table */
     hsize_t     nrecords; /* Number of records to insert */
     hsize_t     start2;   /* Record to start writing in 2nd table */
diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c
index 4ba5d64..c974e84 100644
--- a/hl/examples/ex_table_10.c
+++ b/hl/examples/ex_table_10.c
@@ -40,10 +40,10 @@ main(void)
     } Particle;
 
     /* Define an array of Particles */
-    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     Particle dst_buf[2 * NRECORDS];
     /* Calculate the size and the offsets of our struct members in memory */
diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c
index 9bf3927..6b38b95 100644
--- a/hl/examples/ex_table_11.c
+++ b/hl/examples/ex_table_11.c
@@ -38,10 +38,10 @@ main(void)
     } Particle1;
 
     /* Define an array of Particles */
-    Particle1 p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                  {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                  {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                  {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle1 p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                  {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                  {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                  {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     /* Calculate the size and the offsets of our struct members in memory */
     size_t dst_size1            = sizeof(Particle1);
@@ -56,7 +56,7 @@ main(void)
     hid_t       file_id;
     hsize_t     chunk_size       = 10;
     int         compress         = 0;
-    Particle1   fill_data[1]     = {{"no data", -1, -1, -99.0f, -99.0}};
+    Particle1   fill_data[1]     = {{"no data", -1, -1, -99.0F, -99.0}};
     int         fill_data_new[1] = {-100};
     hsize_t     position;
     hsize_t     nfields_out;
diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c
index 3e7c27a..a1a2c54 100644
--- a/hl/examples/ex_table_12.c
+++ b/hl/examples/ex_table_12.c
@@ -44,10 +44,10 @@ main(void)
                                   HOFFSET(Particle, pressure), HOFFSET(Particle, temperature)};
 
     /* Define an array of Particles */
-    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0},    {"one", 10, 10, 1.0f, 10.0},
-                                 {"two", 20, 20, 2.0f, 20.0},  {"three", 30, 30, 3.0f, 30.0},
-                                 {"four", 40, 40, 4.0f, 40.0}, {"five", 50, 50, 5.0f, 50.0},
-                                 {"six", 60, 60, 6.0f, 60.0},  {"seven", 70, 70, 7.0f, 70.0}};
+    Particle p_data[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                 {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                 {"four", 40, 40, 4.0F, 40.0}, {"five", 50, 50, 5.0F, 50.0},
+                                 {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
     /* Define field information */
     const char *field_names[NFIELDS] = {"Name", "Latitude", "Longitude", "Pressure", "Temperature"};
@@ -56,7 +56,7 @@ main(void)
     hid_t       file_id;
     hsize_t     chunk_size   = 10;
     int         compress     = 0;
-    Particle    fill_data[1] = {{"no data", -1, -1, -99.0f, -99.0}};
+    Particle    fill_data[1] = {{"no data", -1, -1, -99.0F, -99.0}};
     hsize_t     nfields_out;
     hsize_t     nrecords_out;
 
diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index 368c083..a56e6cf 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -75,7 +75,7 @@ main(int argc, char **argv)
     int  nerrors = 0;
     char filename[65];
 
-    if (argc < 2) {
+    if (argc < 2 || !argv[0] || !argv[1]) {
         HDprintf("Usage: gen_test [le | be]\n");
         return 1;
     }
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 8c6ef91..964e13f 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -5210,6 +5210,8 @@ test_attach_detach(void)
 
     HL_TESTING2("permutations of attaching and detaching");
 
+    gid = var1_id = var2_id = var3_id = H5I_INVALID_HID;
+
     if ((fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 1d3a569..5f30d4b 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -45,10 +45,10 @@ typedef struct particle_t {
  * a static array of particles for writing and checking reads
  *-------------------------------------------------------------------------
  */
-static particle_t testPart[NRECORDS] = {{"zero", 0, 0, 0.0f, 0.0f},    {"one", 10, 10, 1.0f, 10.0f},
-                                        {"two", 20, 20, 2.0f, 20.0f},  {"three", 30, 30, 3.0f, 30.0f},
-                                        {"four", 40, 40, 4.0f, 40.0f}, {"five", 50, 50, 5.0f, 50.0f},
-                                        {"six", 60, 60, 6.0f, 60.0f},  {"seven", 70, 70, 7.0f, 70.0f}};
+static particle_t testPart[NRECORDS] = {{"zero", 0, 0, 0.0F, 0.0},    {"one", 10, 10, 1.0F, 10.0},
+                                        {"two", 20, 20, 2.0F, 20.0},  {"three", 30, 30, 3.0F, 30.0},
+                                        {"Four", 40, 40, 4.0F, 40.0}, {"Five", 50, 50, 5.0F, 50.0},
+                                        {"six", 60, 60, 6.0F, 60.0},  {"seven", 70, 70, 7.0F, 70.0}};
 
 /*-------------------------------------------------------------------------
  * function that compares one particle
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 531f778..6199e27 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -245,7 +245,7 @@ test_table(hid_t fid, int do_write)
                                  {"six", 60, 6.0, 60.0, 60},
                                  {"seven", 70, 7.0, 70.0, 70}};
     /* buffers for the field "Pressure" and "New_field" */
-    float pressure_in[NRECORDS] = {0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f};
+    float pressure_in[NRECORDS] = {0.0F, 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F, 7.0F};
     float pressure_out[NRECORDS];
     int   buf_new[NRECORDS] = {0, 1, 2, 3, 4, 5, 6, 7};
     /* buffers for the fields "Latitude,Longitude"  */
@@ -254,8 +254,8 @@ test_table(hid_t fid, int do_write)
     /* buffers for the fields "Name,Pressure"  */
     namepressure_t namepre_out[NRECORDS];
     namepressure_t namepre_in[NRECORDS] = {
-        {"zero", 0.0f}, {"one", 1.0f},  {"two", 2.0f}, {"three", 3.0f},
-        {"four", 4.0f}, {"five", 5.0f}, {"six", 6.0f}, {"seven", 7.0f},
+        {"zero", 0.0F}, {"one", 1.0F},  {"two", 2.0F}, {"three", 3.0F},
+        {"four", 4.0F}, {"five", 5.0F}, {"six", 6.0F}, {"seven", 7.0F},
     };
 
     /*-------------------------------------------------------------------------
diff --git a/hl/tools/h5watch/h5watchgentest.c b/hl/tools/h5watch/h5watchgentest.c
index c83e485..44cb0cb 100644
--- a/hl/tools/h5watch/h5watchgentest.c
+++ b/hl/tools/h5watch/h5watchgentest.c
@@ -224,7 +224,7 @@ main(void)
         one_cbuf[i].field2.b.a = 20;
         one_cbuf[i].field2.b.b = 40;
         one_cbuf[i].field2.b.c = 80;
-        one_cbuf[i].field3     = 3.0F;
+        one_cbuf[i].field3     = 3.0;
         one_cbuf[i].field4.a   = 4;
         one_cbuf[i].field4.b   = 8;
     } /* end for */
@@ -313,7 +313,7 @@ main(void)
         two_cbuf[i].field2.b.a = 20;
         two_cbuf[i].field2.b.b = 40;
         two_cbuf[i].field2.b.c = 80;
-        two_cbuf[i].field3     = 3.0F;
+        two_cbuf[i].field3     = 3.0;
         two_cbuf[i].field4.a   = 4;
         two_cbuf[i].field4.b   = 8;
     } /* end for */
diff --git a/java/test/TestH5Arw.java b/java/test/TestH5Arw.java
index 2f5497b..a144ab7 100644
--- a/java/test/TestH5Arw.java
+++ b/java/test/TestH5Arw.java
@@ -102,7 +102,7 @@ public class TestH5Arw {
         if (H5aid >= 0)
             try {H5.H5Aclose(H5aid);} catch (Exception ex) {}
         if (H5did >= 0)
-            try {H5.H5Aclose(H5did);} catch (Exception ex) {}
+            try {H5.H5Dclose(H5did);} catch (Exception ex) {}
         if (H5fid > 0)
             try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
         H5fid = HDF5Constants.H5I_INVALID_HID;
diff --git a/release_docs/README_HDF5_CMake b/release_docs/README_HDF5_CMake
index cf0ab6f..c63eaca 100644
--- a/release_docs/README_HDF5_CMake
+++ b/release_docs/README_HDF5_CMake
@@ -1,15 +1,16 @@
 This tar file contains
 
-    build-unix.sh       script to build HDF5 with CMake on unix machines
-    build-unix-hpc.sh   script to build HDF5 with CMake on unix machines and run
-                        tests with batch scripts (sbatch).
+    build-unix.sh         script to build HDF5 with CMake on unix machines
+    build-unix-hpc.sh     script to build HDF5 with CMake on unix machines and run
+                          tests with batch scripts (sbatch).
     CTestScript.cmake
-    HDF5config.cmake    CMake scripts for building HDF5
+    HDF5config.cmake      CMake scripts for building HDF5
     HDF5options.cmake
-    hdf5-1.13.0         HDF5 1.13.0 source
-    LIBAEC.tar.gz       source for building SZIP replacement
-    ZLib.tar.gz         source for building ZLIB
-    hdf5_plugins.tar.gz source for building compression plugins
+    hdf5-1.13.0           HDF5 1.13.0 source
+    LIBAEC.tar.gz         source for building SZIP replacement
+    ZLib.tar.gz           source for building ZLIB
+    hdf5_plugins.tar.gz   source for building compression plugins
+    HDF5Examples-1.14.3-Source.tar.gz  source for building examples
 
 For more information about building HDF5 with CMake, see USING_HDF5_CMake.txt in
 hdf5-1.13.0/release_docs, or
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 1e69f54..86074d0 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -463,6 +463,25 @@ New Features
 
     Library:
     --------
+    - Change how the release part of version, in major.minor.release is checked
+      for compatibility
+
+      The HDF5 library uses a function, H5check_version, to check that
+      the version defined in the header files, which is used to compile an
+      application is compatible with the version codified in the library, which
+      the application loads at runtime. This previously required an exact match
+      or the library would print a warning, dump the build settings and then
+      abort or continue. An environment variable controlled the logic.
+
+      Now the function first checks that the library release version, in
+      major.minor.release, is not older than the version in the headers.
+      Secondly, if the release version is different, it checks if either
+      the library version or the header version is in the exception list, in
+      which case the release part of version, in major.minor.release, must
+      be exact. An environment variable still controls the logic.
+
+        (ADB - 2021/07/27)
+
     - gcc warning suppression macros were moved out of H5public.h
 
       The HDF5 library uses a set of macros to suppress warnings on gcc.
@@ -726,6 +745,12 @@ New Features
 
     Fortran Library:
     ----------------
+
+    - H5Fget_name_f fixed to handle correctly trailing whitespaces and
+      newly allocated buffers.
+
+      (MSB - 2021/08/30, github-826,972)
+
     - Add wrappers for H5Pset/get_file_locking() API calls
 
         h5pget_file_locking_f()
@@ -801,6 +826,26 @@ New Features
 
     Tools:
     ------
+    - Refactored the perform tools and removed depends on test library.
+
+        Moved the perf and h5perf tools from tools/test/perform to
+        tools/src/h5perf so that they can be installed. This required
+        that the test library dependency be removed by copying the
+        needed functions from h5test.c.
+        The standalone scripts and other perform tools remain in the
+        tools/test/perform folder.
+
+        (ADB - 2021/08/10)
+
+    - Removed partial long exceptions
+
+        Some of the tools accepted shortened versions of the long options
+        (ex: --datas instead of --dataset). These were implemented inconsistently,
+        are difficult to maintian, and occasionally block useful long option
+        names. These partial long options have been removed from all the tools.
+
+        (DER - 2021/08/03)
+
     - h5repack added help text for user-defined filters.
 
         Added help text line that states the valid values of the filter flag
@@ -885,6 +930,24 @@ Bug Fixes since HDF5-1.12.0 release
 ===================================
     Library
     -------
+    - Fixed an invalid read and memory leak when parsing corrupt file space
+      info messages
+
+        When the corrupt file from CVE-2020-10810 was parsed by the library,
+        the code that imports the version 0 file space info object header
+        message to the version 1 struct could read past the buffer read from
+        the disk, causing an invalid memory read. Not catching this error would
+        cause downstream errors that eventually resulted in a previously
+        allocated buffer to be unfreed when the library shut down. In builds
+        where the free lists are in use, this could result in an infinite loop
+        and SIGABRT when the library shuts down.
+
+        We now track the buffer size and raise an error on attempts to read
+        past the end of it.
+
+        (DER - 2021/08/12, HDFFV-11053)
+
+
     - Fixed CVE-2018-14460
 
         The tool h5repack produced a segfault when the rank in dataspace
@@ -1060,6 +1123,30 @@ Bug Fixes since HDF5-1.12.0 release
 
     Configuration
     -------------
+    - Fixed CMake C++ compiler flags
+
+      A recent refactoring of the C++ configure files accidently removed the
+      file that executed the enable_language command for C++ needed by the
+      HDFCXXCompilerFlags.cmake file. Also updated the intel warnings files,
+      including adding support for windows platforms.
+
+      (ADB - 2021/08/10)
+
+    - Better support for libaec (open-source Szip library) in CMake
+
+      Implemented better support for libaec 1.0.5 (or later) library. This version
+      of libaec contains improvements for better integration with HDF5. Furthermore,
+      the variable USE_LIBAEC_STATIC has been introduced to allow to make use of
+      static version of libaec library. Use libaec_DIR or libaec_ROOT to set
+      the location in which libaec can be found.
+
+      Be aware, the Szip library of libaec 1.0.4 depends on another library within
+      libaec library. This dependency is not specified in the current CMake
+      configuration which means that one can not use the static Szip library of
+      libaec 1.0.4 when building HDF5. This has been resolved in libaec 1.0.5.
+
+      (JWSB - 2021/06/22)
+
     - Refactor CMake configure for Fortran
 
       The Fortran configure tests for KINDs reused a single output file that was
@@ -1421,6 +1508,10 @@ The following platforms are not supported but have been tested for this release.
 
 Known Problems
 ==============
+    Setting a variable-length dataset fill value will leak the memory allocated
+    for the p field of the hvl_t struct. A fix is in progress for this.
+    HDFFV-10840
+
     CMake files do not behave correctly with paths containing spaces.
     Do not use spaces in paths because the required escaping for handling spaces
     results in very complex and fragile build files.
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index bd089a6..a12a952 100644
--- a/release_docs/USING_CMake_Examples.txt
+++ b/release_docs/USING_CMake_Examples.txt
@@ -83,6 +83,7 @@ III. Defaults in the HDF5_Examples_options.cmake file
 ####         HDF_BUILD_CXX:BOOL=OFF                                                       ###
 ####         HDF_BUILD_FORTRAN:BOOL=OFF                                                   ###
 ####         HDF_BUILD_JAVA:BOOL=OFF                                                      ###
+####         HDF_BUILD_FILTERS:BOOL=OFF                                                   ###
 ####         BUILD_TESTING:BOOL=OFF                                                       ###
 ####         HDF_ENABLE_PARALLEL:BOOL=OFF                                                 ###
 ####         HDF_ENABLE_THREADSAFE:BOOL=OFF                                               ###
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index f2d7754..792c719 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -41,13 +41,30 @@ I. Preconditions
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
-      Windows). If you are using a Windows platform, you can obtain a
-      pre-built Windows binary from The HDF Group's website at
+      Windows). You can obtain pre-built binaries from The HDF Group's website at
       www.hdfgroup.org.
 
    3. Set the environment variable HDF5_DIR to the installed location of
-      the config files for HDF5. On Windows:
+      the config files for HDF5.
+         On Windows:
             HDF5_DIR=C:/Program Files/HDF_Group/HDF5/1.13.x/cmake
+         On unix:
+            HDF5_DIR=<install root folder>/HDF_Group/HDF5/1.13.x/cmake
+
+      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.13.x/bin
+         On unix (*.so):
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH:<install root folder>/HDF_Group/HDF5/1.13.x/lib
+
+      If you are using filter plugin libraries, you will need to set the
+      HDF5_PLUGIN_PATH environment variable.
+         On Windows:
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.13.x/lib/plugin
+         On unix:
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.13.x/lib/plugin
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -99,12 +116,13 @@ These steps are described in more detail below.
             * MinGW Makefiles
             * NMake Makefiles
             * Unix Makefiles
-            * Visual Studio 12 2013
-            * Visual Studio 12 2013 Win64
             * Visual Studio 14 2015
             * Visual Studio 14 2015 Win64
             * Visual Studio 15 2017
             * Visual Studio 15 2017 Win64
+            * Visual Studio 16 2019
+            * ... in addition VS2019 will need to set the "-A" option,
+            * ... [Win32, x64, ARM, ARM64]
 
         <options> is:
             * BUILD_TESTING:BOOL=ON
@@ -114,7 +132,7 @@ These steps are described in more detail below.
 
       2.1  Visual CMake users, click the Configure button. If this is the first time you are
            running cmake-gui in this directory, you will be prompted for the
-           generator you wish to use (for example on Windows, Visual Studio 12 2013).
+           generator you wish to use (for example on Windows, Visual Studio 14 2015 Win64).
            CMake will read in the CMakeLists.txt files from the source directory and
            display options for the HDF5 project. After the first configure you
            can adjust the cache settings and/or specify locations of other programs.
@@ -132,7 +150,7 @@ These steps are described in more detail below.
 
       2.2  Alternative command line example on Windows in c:\MyHDFstuff\hdf5\build directory:
 
-           cmake -G "Visual Studio 12 2013" -DBUILD_TESTING:BOOL=ON ..
+           cmake -G "Visual Studio 14 2015 Win64" -DBUILD_TESTING:BOOL=ON ..
 
    3. Build HDF5 Applications
 
diff --git a/src/H5.c b/src/H5.c
index 71a8a30..3ceaecd 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -70,6 +70,10 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
 /* Library Private Variables */
 /*****************************/
 
+/* Library incompatible release versions */
+const unsigned VERS_RELEASE_EXCEPTIONS[]    = {0};
+const unsigned VERS_RELEASE_EXCEPTIONS_SIZE = 0;
+
 /* statically initialize block for pthread_once call used in initializing */
 /* the first global mutex                                                 */
 #ifdef H5_HAVE_THREADSAFE
@@ -281,13 +285,13 @@ done:
 } /* end H5_init_library() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5_term_library
+ * Function:    H5_term_library
  *
- * Purpose:	Terminate interfaces in a well-defined order due to
- *		dependencies among the interfaces, then terminate
- *		library-specific data.
+ * Purpose:    Terminate interfaces in a well-defined order due to
+ *        dependencies among the interfaces, then terminate
+ *        library-specific data.
  *
- * Return:	void
+ * Return:    void
  *
  *-------------------------------------------------------------------------
  */
@@ -505,22 +509,22 @@ done:
 } /* end H5_term_library() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5dont_atexit
+ * Function:    H5dont_atexit
  *
- * Purpose:	Indicates that the library is not to clean up after itself
- *		when the application exits by calling exit() or returning
- *		from main().  This function must be called before any other
- *		HDF5 function or constant is used or it will have no effect.
+ * Purpose:    Indicates that the library is not to clean up after itself
+ *        when the application exits by calling exit() or returning
+ *        from main().  This function must be called before any other
+ *        HDF5 function or constant is used or it will have no effect.
  *
- *		If this function is used then certain memory buffers will not
- *		be de-allocated nor will open files be flushed automatically.
- *		The application may still call H5close() explicitly to
- *		accomplish these things.
+ *        If this function is used then certain memory buffers will not
+ *        be de-allocated nor will open files be flushed automatically.
+ *        The application may still call H5close() explicitly to
+ *        accomplish these things.
  *
- * Return:	Success:	non-negative
+ * Return:    Success:    non-negative
  *
- *		Failure:	negative if this function is called more than
- *				once or if it is called too late.
+ *        Failure:    negative if this function is called more than
+ *                once or if it is called too late.
  *
  *-------------------------------------------------------------------------
  */
@@ -541,19 +545,19 @@ H5dont_atexit(void)
 } /* end H5dont_atexit() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5garbage_collect
+ * Function:    H5garbage_collect
  *
- * Purpose:	Walks through all the garbage collection routines for the
- *		library, which are supposed to free any unused memory they have
- *		allocated.
+ * Purpose:    Walks through all the garbage collection routines for the
+ *        library, which are supposed to free any unused memory they have
+ *        allocated.
  *
  *      These should probably be registered dynamically in a linked list of
  *          functions to call, but there aren't that many right now, so we
  *          hard-wire them...
  *
- * Return:	Success:	non-negative
+ * Return:    Success:    non-negative
  *
- *		Failure:	negative
+ *        Failure:    negative
  *
  *-------------------------------------------------------------------------
  */
@@ -574,9 +578,9 @@ done:
 } /* end H5garbage_collect() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5set_free_list_limits
+ * Function:    H5set_free_list_limits
  *
- * Purpose:	Sets limits on the different kinds of free lists.  Setting a value
+ * Purpose:    Sets limits on the different kinds of free lists.  Setting a value
  *      of -1 for a limit means no limit of that type.  These limits are global
  *      for the entire library.  Each "global" limit only applies to free lists
  *      of that type, so if an application sets a limit of 1 MB on each of the
@@ -594,9 +598,9 @@ done:
  *  int blk_global_lim;  IN: The limit on all "block" free list memory used
  *  int blk_list_lim;    IN: The limit on memory used in each "block" free list
  *
- * Return:	Success:	non-negative
+ * Return:    Success:    non-negative
  *
- *		Failure:	negative
+ *        Failure:    negative
  *
  *-------------------------------------------------------------------------
  */
@@ -620,11 +624,11 @@ done:
 } /* end H5set_free_list_limits() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5get_free_list_sizes
+ * Function:    H5get_free_list_sizes
  *
- * Purpose:	Gets the current size of the different kinds of free lists that
- *	the library uses to manage memory.  The free list sizes can be set with
- *	H5set_free_list_limits and garbage collected with H5garbage_collect.
+ * Purpose:    Gets the current size of the different kinds of free lists that
+ *    the library uses to manage memory.  The free list sizes can be set with
+ *    H5set_free_list_limits and garbage collected with H5garbage_collect.
  *      These lists are global for the entire library.
  *
  * Parameters:
@@ -633,8 +637,8 @@ done:
  *  size_t *blk_size;    OUT: The current size of all "block" free list memory used
  *  size_t *fac_size;    OUT: The current size of all "factory" free list memory used
  *
- * Return:	Success:	non-negative
- *		Failure:	negative
+ * Return:    Success:    non-negative
+ *        Failure:    negative
  *
  * Programmer:  Quincey Koziol
  *              Friday, March 6, 2020
@@ -659,23 +663,23 @@ done:
 } /* end H5get_free_list_sizes() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5get_alloc_stats
+ * Function:    H5get_alloc_stats
  *
- * Purpose:	Gets the memory allocation statistics for the library, if the
- *	--enable-memory-alloc-sanity-check option was given when building the
+ * Purpose:    Gets the memory allocation statistics for the library, if the
+ *    --enable-memory-alloc-sanity-check option was given when building the
  *      library.  Applications can check whether this option was enabled by
- *	detecting if the 'H5_MEMORY_ALLOC_SANITY_CHECK' macro is defined.  This
- *	option is enabled by default for debug builds of the library and
- *	disabled by default for non-debug builds.  If the option is not enabled,
- *	all the values returned with be 0.  These statistics are global for the
- *	entire library, but don't include allocations from chunked dataset I/O
- *	filters or non-native VOL connectors.
+ *    detecting if the 'H5_MEMORY_ALLOC_SANITY_CHECK' macro is defined.  This
+ *    option is enabled by default for debug builds of the library and
+ *    disabled by default for non-debug builds.  If the option is not enabled,
+ *    all the values returned with be 0.  These statistics are global for the
+ *    entire library, but don't include allocations from chunked dataset I/O
+ *    filters or non-native VOL connectors.
  *
  * Parameters:
  *  H5_alloc_stats_t *stats;            OUT: Memory allocation statistics
  *
- * Return:	Success:	non-negative
- *		Failure:	negative
+ * Return:    Success:    non-negative
+ *        Failure:    negative
  *
  * Programmer:  Quincey Koziol
  *              Saturday, March 7, 2020
@@ -808,12 +812,12 @@ H5__debug_mask(const char *s)
 #ifdef H5_HAVE_PARALLEL
 
 /*-------------------------------------------------------------------------
- * Function:	H5__mpi_delete_cb
+ * Function:    H5__mpi_delete_cb
  *
- * Purpose:	Callback attribute on MPI_COMM_SELF to terminate the HDF5
+ * Purpose:    Callback attribute on MPI_COMM_SELF to terminate the HDF5
  *              library when the communicator is destroyed, i.e. on MPI_Finalize.
  *
- * Return:	MPI_SUCCESS
+ * Return:    MPI_SUCCESS
  *
  *-------------------------------------------------------------------------
  */
@@ -827,18 +831,18 @@ H5__mpi_delete_cb(MPI_Comm H5_ATTR_UNUSED comm, int H5_ATTR_UNUSED keyval, void
 #endif /*H5_HAVE_PARALLEL*/
 
 /*-------------------------------------------------------------------------
- * Function:	H5get_libversion
+ * Function:    H5get_libversion
  *
- * Purpose:	Returns the library version numbers through arguments. MAJNUM
- *		will be the major revision number of the library, MINNUM the
- *		minor revision number, and RELNUM the release revision number.
+ * Purpose:    Returns the library version numbers through arguments. MAJNUM
+ *        will be the major revision number of the library, MINNUM the
+ *        minor revision number, and RELNUM the release revision number.
  *
- * Note:	When printing an HDF5 version number it should be printed as
+ * Note:    When printing an HDF5 version number it should be printed as
  *
- * 		printf("%u.%u.%u", maj, min, rel)		or
- *		printf("version %u.%u release %u", maj, min, rel)
+ *         printf("%u.%u.%u", maj, min, rel)        or
+ *        printf("version %u.%u release %u", maj, min, rel)
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -863,17 +867,20 @@ done:
 } /* end H5get_libversion() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5check_version
+ * Function:    H5check_version
  *
- * Purpose:	Verifies that the arguments match the version numbers
- *		compiled into the library.  This function is intended to be
- *		called from user to verify that the versions of header files
- *		compiled into the application match the version of the hdf5
- *		library.
+ * Purpose:    Verifies that the arguments match the version numbers
+ *        compiled into the library.  This function is intended to be
+ *        called from user to verify that the versions of header files
+ *        compiled into the application match the version of the hdf5
+ *        library.
+ *        Within major.minor.release version, the expectation
+ *        is that all release versions are compatible, exceptions to
+ *        this rule must be added to the VERS_RELEASE_EXCEPTIONS list.
  *
- * Return:	Success:	SUCCEED
+ * Return:    Success:    SUCCEED
  *
- *		Failure:	abort()
+ *        Failure:    abort()
  *
  *-------------------------------------------------------------------------
  */
@@ -886,6 +893,15 @@ done:
     "linked with a different version of static or shared HDF5 library.\n"                                    \
     "You should recompile the application or check your shared library related\n"                            \
     "settings such as 'LD_LIBRARY_PATH'.\n"
+#define RELEASE_MISMATCH_WARNING                                                                             \
+    "Warning! ***HDF5 library release mismatched error***\n"                                                 \
+    "The HDF5 header files used to compile this application are not compatible with\n"                       \
+    "the version used by the HDF5 library to which this application is linked.\n"                            \
+    "Data corruption or segmentation faults may occur if the application continues.\n"                       \
+    "This can happen when an application was compiled by one version of HDF5 but\n"                          \
+    "linked with an incompatible version of static or shared HDF5 library.\n"                                \
+    "You should recompile the application or check your shared library related\n"                            \
+    "settings such as 'LD_LIBRARY_PATH'.\n"
 
 herr_t
 H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
@@ -914,7 +930,11 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
             disable_version_check = (unsigned int)HDstrtol(s, NULL, 0);
     }
 
-    if (H5_VERS_MAJOR != majnum || H5_VERS_MINOR != minnum || H5_VERS_RELEASE != relnum) {
+    /* H5_VERS_MAJOR and H5_VERS_MINOR must match */
+    /* Cast relnum to int to avoid warning for unsigned < 0 comparison
+     * in first release versions */
+    if (H5_VERS_MAJOR != majnum || H5_VERS_MINOR != minnum || H5_VERS_RELEASE > (int)relnum) {
+
         switch (disable_version_check) {
             case 0:
                 HDfprintf(stderr, "%s%s", version_mismatch_warning,
@@ -949,7 +969,51 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
                 break;
         } /* end switch */
 
-    } /* end if */
+    } /* end if (H5_VERS_MAJOR != majnum || H5_VERS_MINOR != minnum || H5_VERS_RELEASE > relnum) */
+
+    /* H5_VERS_RELEASE should be compatible, we will only add checks for exceptions */
+    if (H5_VERS_RELEASE != relnum) {
+        for (unsigned i = 0; i < VERS_RELEASE_EXCEPTIONS_SIZE; i++) {
+            /* Check for incompatible headers or incompatible library */
+            if (VERS_RELEASE_EXCEPTIONS[i] == relnum || VERS_RELEASE_EXCEPTIONS[i] == H5_VERS_RELEASE) {
+                switch (disable_version_check) {
+                    case 0:
+                        HDfprintf(
+                            stderr, "%s%s", version_mismatch_warning,
+                            "You can, at your own risk, disable this warning by setting the environment\n"
+                            "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
+                            "Setting it to 2 or higher will suppress the warning messages totally.\n");
+                        /* Mention the versions we are referring to */
+                        HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum,
+                                  relnum, (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR,
+                                  (unsigned)H5_VERS_RELEASE);
+
+                        /* Bail out now. */
+                        HDfputs("Bye...\n", stderr);
+                        HDabort();
+                    case 1:
+                        /* continue with a warning */
+                        /* Note that the warning message is embedded in the format string.*/
+                        HDfprintf(stderr,
+                                  "%s'HDF5_DISABLE_VERSION_CHECK' "
+                                  "environment variable is set to %d, application will\n"
+                                  "continue at your own risk.\n",
+                                  version_mismatch_warning, disable_version_check);
+                        /* Mention the versions we are referring to */
+                        HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum,
+                                  relnum, (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR,
+                                  (unsigned)H5_VERS_RELEASE);
+                        break;
+                    default:
+                        /* 2 or higher: continue silently */
+                        break;
+                } /* end switch */
+
+            } /* end if */
+
+        } /* end for */
+
+    } /* end if (H5_VERS_RELEASE != relnum) */
 
     /* Indicate that the version check has been performed */
     checked = 1;
@@ -991,7 +1055,7 @@ done:
  *              is failing inexplicably, then try calling this function
  *              first.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -1010,12 +1074,12 @@ done:
 } /* end H5open() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5atclose
+ * Function:    H5atclose
  *
- * Purpose:	Register a callback for the library to invoke when it's
- *		closing.  Callbacks are invoked in LIFO order.
+ * Purpose:    Register a callback for the library to invoke when it's
+ *        closing.  Callbacks are invoked in LIFO order.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -1049,11 +1113,11 @@ done:
 } /* end H5atclose() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5close
+ * Function:    H5close
  *
- * Purpose:	Terminate the library and release all resources.
+ * Purpose:    Terminate the library and release all resources.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -1074,9 +1138,9 @@ H5close(void)
 } /* end H5close() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5allocate_memory
+ * Function:    H5allocate_memory
  *
- * Purpose:	    Allocate a memory buffer with the semantics of malloc().
+ * Purpose:        Allocate a memory buffer with the semantics of malloc().
  *
  *              NOTE: This function is intended for use with filter
  *              plugins so that all allocation and free operations
@@ -1114,9 +1178,9 @@ H5allocate_memory(size_t size, hbool_t clear)
 } /* end H5allocate_memory() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5resize_memory
+ * Function:    H5resize_memory
  *
- * Purpose:	    Resize a memory buffer with the semantics of realloc().
+ * Purpose:        Resize a memory buffer with the semantics of realloc().
  *
  *              NOTE: This function is intended for use with filter
  *              plugins so that all allocation and free operations
@@ -1151,14 +1215,14 @@ H5resize_memory(void *mem, size_t size)
 } /* end H5resize_memory() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5free_memory
+ * Function:    H5free_memory
  *
- * Purpose:	    Frees memory allocated by the library that it is the user's
+ * Purpose:        Frees memory allocated by the library that it is the user's
  *              responsibility to free.  Ensures that the same library
  *              that was used to allocate the memory frees it.  Passing
  *              NULL pointers is allowed.
  *
- * Return:	    SUCCEED/FAIL
+ * Return:        SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
@@ -1175,12 +1239,12 @@ H5free_memory(void *mem)
 } /* end H5free_memory() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5is_library_threadsafe
+ * Function:    H5is_library_threadsafe
  *
- * Purpose:	    Checks to see if the library was built with thread-safety
+ * Purpose:        Checks to see if the library was built with thread-safety
  *              enabled.
  *
- * Return:	    SUCCEED/FAIL
+ * Return:        SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
@@ -1206,16 +1270,16 @@ H5is_library_threadsafe(hbool_t *is_ts /*out*/)
 } /* end H5is_library_threadsafe() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5is_library_terminating
+ * Function:    H5is_library_terminating
  *
- * Purpose:	Checks to see if the library is shutting down.
+ * Purpose:    Checks to see if the library is shutting down.
  *
- * Note:	Useful for plugins to detect when the library is terminating.
- *		For example, a VOL connector could check if a "file close"
- *		callback was the result of the library shutdown process, or
- *		an API action from the application.
+ * Note:    Useful for plugins to detect when the library is terminating.
+ *        For example, a VOL connector could check if a "file close"
+ *        callback was the result of the library shutdown process, or
+ *        an API action from the application.
  *
- * Return:	SUCCEED/FAIL
+ * Return:    SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index b14194b..e9b8a47 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -275,24 +275,24 @@ typedef struct H5AC_proxy_entry_t {
   /* size_t      min_size               = */ ( 1 * 1024 * 1024),              \
   /* long int    epoch_length           = */ 50000,                           \
   /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,             \
-  /* double      lower_hr_threshold     = */ 0.9f,                            \
-  /* double      increment              = */ 2.0f,                            \
+  /* double      lower_hr_threshold     = */ 0.9,                             \
+  /* double      increment              = */ 2.0,                             \
   /* hbool_t     apply_max_increment    = */ TRUE,                            \
   /* size_t      max_increment          = */ (4 * 1024 * 1024),               \
   /* enum H5C_cache_flash_incr_mode       */                                  \
   /*                    flash_incr_mode = */ H5C_flash_incr__add_space,       \
-  /* double      flash_multiple         = */ 1.4f,                            \
-  /* double      flash_threshold        = */ 0.25f,                           \
+  /* double      flash_multiple         = */ 1.4,                             \
+  /* double      flash_threshold        = */ 0.25,                            \
   /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,\
-  /* double      upper_hr_threshold     = */ 0.999f,                          \
-  /* double      decrement              = */ 0.9f,                            \
+  /* double      upper_hr_threshold     = */ 0.999,                           \
+  /* double      decrement              = */ 0.9,                             \
   /* hbool_t     apply_max_decrement    = */ TRUE,                            \
   /* size_t      max_decrement          = */ (1 * 1024 * 1024),               \
   /* int         epochs_before_eviction = */ 3,                               \
   /* hbool_t     apply_empty_reserve    = */ TRUE,                            \
-  /* double      empty_reserve          = */ 0.1f,                            \
+  /* double      empty_reserve          = */ 0.1,                             \
   /* size_t      dirty_bytes_threshold  = */ (256 * 1024),                    \
-  /* int         metadata_write_strategy = */                                  \
+  /* int         metadata_write_strategy = */                                 \
                     H5AC__DEFAULT_METADATA_WRITE_STRATEGY  \
 }
 #endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5Cquery.c b/src/H5Cquery.c
index 6cf8ffc..710ce2a 100644
--- a/src/H5Cquery.c
+++ b/src/H5Cquery.c
@@ -201,7 +201,7 @@ H5C_get_cache_hit_rate(const H5C_t *cache_ptr, double *hit_rate_ptr)
     if (cache_ptr->cache_accesses > 0)
         *hit_rate_ptr = ((double)(cache_ptr->cache_hits)) / ((double)(cache_ptr->cache_accesses));
     else
-        *hit_rate_ptr = 0.0f;
+        *hit_rate_ptr = 0.0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index ccae784..6600417 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -107,9 +107,9 @@
 /*#define H5D_CHUNK_DEBUG */
 
 /* Flags for the "edge_chunk_state" field below */
-#define H5D_RDCC_DISABLE_FILTERS 0x01u /* Disable filters on this chunk */
+#define H5D_RDCC_DISABLE_FILTERS 0x01U /* Disable filters on this chunk */
 #define H5D_RDCC_NEWLY_DISABLED_FILTERS                                                                      \
-    0x02u /* Filters have been disabled since                                                                \
+    0x02U /* Filters have been disabled since                                                                \
            * the last flush */
 
 /******************/
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 600f08a..d1861c4 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -810,11 +810,19 @@ H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, const H5S_t *file_
             io_info->io_ops.single_write = H5D__mpio_select_write;
         } /* end if */
         else {
+            int comm_size = 0;
+
+            /* Retrieve size of MPI communicator used for file */
+            if ((comm_size = H5F_shared_mpi_get_size(io_info->f_sh)) < 0)
+                HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get MPI communicator size")
+
             /* Check if there are any filters in the pipeline. If there are,
-             * we cannot break to independent I/O if this is a write operation;
-             * otherwise there will be metadata inconsistencies in the file.
+             * we cannot break to independent I/O if this is a write operation
+             * with multiple ranks involved; otherwise, there will be metadata
+             * inconsistencies in the file.
              */
-            if (io_info->op_type == H5D_IO_OP_WRITE && io_info->dset->shared->dcpl_cache.pline.nused > 0) {
+            if (comm_size > 1 && io_info->op_type == H5D_IO_OP_WRITE &&
+                io_info->dset->shared->dcpl_cache.pline.nused > 0) {
                 H5D_mpio_no_collective_cause_t cause;
                 uint32_t                       local_no_collective_cause;
                 uint32_t                       global_no_collective_cause;
diff --git a/src/H5Fefc.c b/src/H5Fefc.c
index 7d6b089..31cb7a2 100644
--- a/src/H5Fefc.c
+++ b/src/H5Fefc.c
@@ -36,10 +36,10 @@
 #include "H5Pprivate.h"  /* Property lists                       */
 
 /* Special values for the "tag" field below */
-#define H5F_EFC_TAG_DEFAULT   -1
-#define H5F_EFC_TAG_LOCK      -2
-#define H5F_EFC_TAG_CLOSE     -3
-#define H5F_EFC_TAG_DONTCLOSE -4
+#define H5F_EFC_TAG_DEFAULT   (-1)
+#define H5F_EFC_TAG_LOCK      (-2)
+#define H5F_EFC_TAG_CLOSE     (-3)
+#define H5F_EFC_TAG_DONTCLOSE (-4)
 
 /* Structure for each entry in a file's external file cache */
 typedef struct H5F_efc_ent_t {
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 62dc2f2..3aae0cb 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -78,8 +78,8 @@ static herr_t H5O__cache_chk_free_icr(void *thing);
 static herr_t H5O__prefix_deserialize(const uint8_t *image, H5O_cache_ud_t *udata);
 
 /* Chunk routines */
-static herr_t H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
-                                     H5O_common_cache_ud_t *udata, hbool_t *dirty);
+static herr_t H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t *image,
+                                     size_t len, H5O_common_cache_ud_t *udata, hbool_t *dirty);
 static herr_t H5O__chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno);
 
 /* Misc. routines */
@@ -287,7 +287,7 @@ H5O__cache_verify_chksum(const void *_image, size_t len, void *_udata)
  *-------------------------------------------------------------------------
  */
 static void *
-H5O__cache_deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t *dirty)
+H5O__cache_deserialize(const void *image, size_t len, void *_udata, hbool_t *dirty)
 {
     H5O_t *         oh        = NULL;                     /* Object header read in */
     H5O_cache_ud_t *udata     = (H5O_cache_ud_t *)_udata; /* User data for callback */
@@ -333,7 +333,7 @@ H5O__cache_deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void
         oh->proxy = NULL;
 
     /* Parse the first chunk */
-    if (H5O__chunk_deserialize(oh, udata->common.addr, udata->chunk0_size, (const uint8_t *)image,
+    if (H5O__chunk_deserialize(oh, udata->common.addr, udata->chunk0_size, (const uint8_t *)image, len,
                                &(udata->common), dirty) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't deserialize first object header chunk")
 
@@ -736,7 +736,7 @@ H5O__cache_chk_verify_chksum(const void *_image, size_t len, void *_udata)
  *-------------------------------------------------------------------------
  */
 static void *
-H5O__cache_chk_deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t *dirty)
+H5O__cache_chk_deserialize(const void *image, size_t len, void *_udata, hbool_t *dirty)
 {
     H5O_chunk_proxy_t * chk_proxy = NULL;                         /* Chunk proxy object */
     H5O_chk_cache_ud_t *udata     = (H5O_chk_cache_ud_t *)_udata; /* User data for callback */
@@ -763,7 +763,7 @@ H5O__cache_chk_deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len,
         HDassert(udata->common.cont_msg_info);
 
         /* Parse the chunk */
-        if (H5O__chunk_deserialize(udata->oh, udata->common.addr, udata->size, (const uint8_t *)image,
+        if (H5O__chunk_deserialize(udata->oh, udata->common.addr, udata->size, (const uint8_t *)image, len,
                                    &(udata->common), dirty) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't deserialize object header chunk")
 
@@ -1275,7 +1275,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
+H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t *image, size_t len,
                        H5O_common_cache_ud_t *udata, hbool_t *dirty)
 {
     const uint8_t *chunk_image;          /* Pointer into buffer to decode */
@@ -1295,6 +1295,7 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image
     HDassert(oh);
     HDassert(H5F_addr_defined(addr));
     HDassert(image);
+    HDassert(len);
     HDassert(udata->f);
     HDassert(udata->cont_msg_info);
 
@@ -1315,14 +1316,16 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image
     oh->chunk[chunkno].addr = addr;
     if (chunkno == 0)
         /* First chunk's 'image' includes room for the object header prefix */
-        oh->chunk[0].size = len + (size_t)H5O_SIZEOF_HDR(oh);
+        oh->chunk[0].size = chunk_size + (size_t)H5O_SIZEOF_HDR(oh);
     else
-        oh->chunk[chunkno].size = len;
+        oh->chunk[chunkno].size = chunk_size;
     if (NULL == (oh->chunk[chunkno].image = H5FL_BLK_MALLOC(chunk_image, oh->chunk[chunkno].size)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, FAIL, "memory allocation failed")
     oh->chunk[chunkno].chunk_proxy = NULL;
 
     /* Copy disk image into chunk's image */
+    if (len < oh->chunk[chunkno].size)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "attempted to copy too many disk image bytes into buffer")
     H5MM_memcpy(oh->chunk[chunkno].image, image, oh->chunk[chunkno].size);
 
     /* Point into chunk image to decode */
diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c
index 44c4985..b60f589 100644
--- a/src/H5Ofsinfo.c
+++ b/src/H5Ofsinfo.c
@@ -91,11 +91,12 @@ H5FL_DEFINE_STATIC(H5O_fsinfo_t);
  */
 static void *
 H5O__fsinfo_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
-                   unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+                   unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p)
 {
-    H5O_fsinfo_t * fsinfo = NULL;    /* File space info message */
-    H5F_mem_page_t ptype;            /* Memory type for iteration */
-    unsigned       vers;             /* message version */
+    H5O_fsinfo_t * fsinfo = NULL; /* File space info message */
+    H5F_mem_page_t ptype;         /* Memory type for iteration */
+    unsigned       vers;          /* message version */
+    const uint8_t *p_end     = p + p_size;
     void *         ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
@@ -136,8 +137,12 @@ H5O__fsinfo_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU
                 fsinfo->threshold = threshold;
                 if (HADDR_UNDEF == (fsinfo->eoa_pre_fsm_fsalloc = H5F_get_eoa(f, H5FD_MEM_DEFAULT)))
                     HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "unable to get file size")
-                for (type = H5FD_MEM_SUPER; type < H5FD_MEM_NTYPES; type++)
+                for (type = H5FD_MEM_SUPER; type < H5FD_MEM_NTYPES; type++) {
+                    if (p + H5_SIZEOF_HADDR_T > p_end)
+                        HGOTO_ERROR(H5E_FILE, H5E_CANTDECODE, NULL,
+                                    "ran off end of input buffer while decoding")
                     H5F_addr_decode(f, &p, &(fsinfo->fs_addr[type - 1]));
+                }
                 break;
 
             case H5F_FILE_SPACE_ALL:
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index dcaa415..217bfda 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -68,7 +68,7 @@
 #define H5D_XFER_BTREE_SPLIT_RATIO_SIZE sizeof(double[3])
 #define H5D_XFER_BTREE_SPLIT_RATIO_DEF                                                                       \
     {                                                                                                        \
-        0.1f, 0.5f, 0.9f                                                                                     \
+        0.1, 0.5, 0.9                                                                                        \
     }
 #define H5D_XFER_BTREE_SPLIT_RATIO_ENC H5P__dxfr_btree_split_ratio_enc
 #define H5D_XFER_BTREE_SPLIT_RATIO_DEC H5P__dxfr_btree_split_ratio_dec
@@ -2384,7 +2384,7 @@ H5Pset_dataset_io_hyperslab_selection(hid_t plist_id, unsigned rank, H5S_seloper
 done:
     /* Cleanup on failure */
     if (ret_value < 0) {
-        if (reset_prop_on_error && H5P_poke(plist, H5D_XFER_DSET_IO_SEL_NAME, &space) < 0)
+        if (reset_prop_on_error && plist && H5P_poke(plist, H5D_XFER_DSET_IO_SEL_NAME, &space) < 0)
             HDONE_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "error setting dataset I/O selection")
         if (space_created && H5S_close(space) < 0)
             HDONE_ERROR(H5E_PLIST, H5E_CLOSEERROR, FAIL, "unable to release dataspace")
diff --git a/src/H5SL.c b/src/H5SL.c
index 166019b..ba9721c 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -209,7 +209,7 @@
         /* Check if we need to increase allocation of forward pointers */                                    \
         if (LVL + 1 >= 1u << X->log_nalloc) {                                                                \
             H5SL_node_t **_tmp;                                                                              \
-            HDassert(LVL + 1 == 1u << X->log_nalloc);                                                        \
+            HDassert(LVL + 1 == 1U << X->log_nalloc);                                                        \
             /* Double the amount of allocated space */                                                       \
             X->log_nalloc++;                                                                                 \
                                                                                                              \
@@ -251,7 +251,7 @@
         /* Check if we can reduce the allocation of forward pointers */                                      \
         if (LVL <= 1u << (X->log_nalloc - 1)) {                                                              \
             H5SL_node_t **_tmp;                                                                              \
-            HDassert(LVL == 1u << (X->log_nalloc - 1));                                                      \
+            HDassert(LVL == 1U << (X->log_nalloc - 1));                                                      \
             X->log_nalloc--;                                                                                 \
                                                                                                              \
             /* Allocate space for new forward pointers */                                                    \
diff --git a/src/H5SM.c b/src/H5SM.c
index 5f055bb..b09cb45 100644
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -1079,7 +1079,7 @@ H5SM_try_share(H5F_t *f, H5O_t *open_oh, unsigned defer_flags, unsigned type_id,
     ssize_t               index_num;
     htri_t                tri_ret;
 #ifndef NDEBUG
-    unsigned deferred_type = -1u;
+    unsigned deferred_type = -1U;
 #endif
     htri_t ret_value = TRUE;
 
diff --git a/src/H5T.c b/src/H5T.c
index d661e34..b3aeac1 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -290,7 +290,7 @@
 #define H5T_INIT_TYPE_SET_SIZE(SIZE)                                                                         \
     {                                                                                                        \
         dt->shared->size          = SIZE;                                                                    \
-        dt->shared->u.atomic.prec = 8 * SIZE;                                                                \
+        dt->shared->u.atomic.prec = 8 * (SIZE);                                                              \
     }
 
 #define H5T_INIT_TYPE_NOSET_SIZE(SIZE)                                                                       \
@@ -327,7 +327,7 @@
             H5_GLUE3(H5T_INIT_TYPE_, GUTS, _CORE)                                                            \
                                                                                                              \
             /* Register result */                                                                            \
-            if ((GLOBAL = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)                                        \
+            if (((GLOBAL) = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0)                                      \
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom")        \
     }
 
@@ -560,8 +560,8 @@ size_t H5T_NATIVE_UINT_FAST64_ALIGN_g  = 0;
 
 /* Useful floating-point values for conversion routines */
 /* (+/- Inf for all floating-point types) */
-float  H5T_NATIVE_FLOAT_POS_INF_g  = 0.0f;
-float  H5T_NATIVE_FLOAT_NEG_INF_g  = 0.0f;
+float  H5T_NATIVE_FLOAT_POS_INF_g  = 0.0F;
+float  H5T_NATIVE_FLOAT_NEG_INF_g  = 0.0F;
 double H5T_NATIVE_DOUBLE_POS_INF_g = 0.0;
 double H5T_NATIVE_DOUBLE_NEG_INF_g = 0.0;
 
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 2e1a474..a8a63bf 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -425,22 +425,22 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
 #define H5Z_scaleoffset_check_3(i, type, pow_fun, round_fun, max, min, minbits, D_val)                       \
     {                                                                                                        \
         if (sizeof(type) == sizeof(int)) {                                                                   \
-            if (round_fun(max * pow_fun(10.0f, (type)D_val) - min * pow_fun(10.0f, (type)D_val)) >           \
-                pow_fun(2.0f, (type)(sizeof(int) * 8 - 1))) {                                                \
+            if (round_fun(max * pow_fun(10.0F, (type)D_val) - min * pow_fun(10.0F, (type)D_val)) >           \
+                pow_fun(2.0F, (type)(sizeof(int) * 8 - 1))) {                                                \
                 *minbits = sizeof(int) * 8;                                                                  \
                 goto done;                                                                                   \
             }                                                                                                \
         }                                                                                                    \
         else if (sizeof(type) == sizeof(long)) {                                                             \
-            if (round_fun(max * pow_fun(10.0f, (type)D_val) - min * pow_fun(10.0f, (type)D_val)) >           \
-                pow_fun(2.0f, (type)(sizeof(long) * 8 - 1))) {                                               \
+            if (round_fun(max * pow_fun(10.0F, (type)D_val) - min * pow_fun(10.0F, (type)D_val)) >           \
+                pow_fun(2.0F, (type)(sizeof(long) * 8 - 1))) {                                               \
                 *minbits = sizeof(long) * 8;                                                                 \
                 goto done;                                                                                   \
             }                                                                                                \
         }                                                                                                    \
         else if (sizeof(type) == sizeof(long long)) {                                                        \
-            if (round_fun(max * pow_fun(10.0f, (type)D_val) - min * pow_fun(10.0f, (type)D_val)) >           \
-                pow_fun(2.0f, (type)(sizeof(long long) * 8 - 1))) {                                          \
+            if (round_fun(max * pow_fun(10.0F, (type)D_val) - min * pow_fun(10.0F, (type)D_val)) >           \
+                pow_fun(2.0F, (type)(sizeof(long long) * 8 - 1))) {                                          \
                 *minbits = sizeof(long long) * 8;                                                            \
                 goto done;                                                                                   \
             }                                                                                                \
@@ -530,27 +530,27 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
     {                                                                                                        \
         if (sizeof(type) == sizeof(int))                                                                     \
             for (i = 0; i < d_nelmts; i++) {                                                                 \
-                if (abs_fun(buf[i] - filval) < pow_fun(10.0f, (type)-D_val))                                 \
+                if (abs_fun(buf[i] - filval) < pow_fun(10.0F, (type)-D_val))                                 \
                     *(int *)((void *)&buf[i]) = (int)(((unsigned int)1 << *minbits) - 1);                    \
                 else                                                                                         \
-                    *(int *)((void *)&buf[i]) = (int)lround_fun(buf[i] * pow_fun(10.0f, (type)D_val) -       \
-                                                                min * pow_fun(10.0f, (type)D_val));          \
+                    *(int *)((void *)&buf[i]) = (int)lround_fun(buf[i] * pow_fun(10.0F, (type)D_val) -       \
+                                                                min * pow_fun(10.0F, (type)D_val));          \
             }                                                                                                \
         else if (sizeof(type) == sizeof(long))                                                               \
             for (i = 0; i < d_nelmts; i++) {                                                                 \
-                if (abs_fun(buf[i] - filval) < pow_fun(10.0f, (type)-D_val))                                 \
+                if (abs_fun(buf[i] - filval) < pow_fun(10.0F, (type)-D_val))                                 \
                     *(long *)((void *)&buf[i]) = (long)(((unsigned long)1 << *minbits) - 1);                 \
                 else                                                                                         \
-                    *(long *)((void *)&buf[i]) = lround_fun(buf[i] * pow_fun(10.0f, (type)D_val) -           \
-                                                            min * pow_fun(10.0f, (type)D_val));              \
+                    *(long *)((void *)&buf[i]) = lround_fun(buf[i] * pow_fun(10.0F, (type)D_val) -           \
+                                                            min * pow_fun(10.0F, (type)D_val));              \
             }                                                                                                \
         else if (sizeof(type) == sizeof(long long))                                                          \
             for (i = 0; i < d_nelmts; i++) {                                                                 \
-                if (abs_fun(buf[i] - filval) < pow_fun(10.0f, (type)-D_val))                                 \
+                if (abs_fun(buf[i] - filval) < pow_fun(10.0F, (type)-D_val))                                 \
                     *(long long *)((void *)&buf[i]) = (long long)(((unsigned long long)1 << *minbits) - 1);  \
                 else                                                                                         \
-                    *(long long *)((void *)&buf[i]) = llround_fun(buf[i] * pow_fun(10.0f, (type)D_val) -     \
-                                                                  min * pow_fun(10.0f, (type)D_val));        \
+                    *(long long *)((void *)&buf[i]) = llround_fun(buf[i] * pow_fun(10.0F, (type)D_val) -     \
+                                                                  min * pow_fun(10.0F, (type)D_val));        \
             }                                                                                                \
         else                                                                                                 \
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
@@ -561,16 +561,16 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
     {                                                                                                        \
         if (sizeof(type) == sizeof(int))                                                                     \
             for (i = 0; i < d_nelmts; i++)                                                                   \
-                *(int *)((void *)&buf[i]) = (int)lround_fun(buf[i] * pow_fun(10.0f, (type)D_val) -           \
-                                                            min * pow_fun(10.0f, (type)D_val));              \
+                *(int *)((void *)&buf[i]) = (int)lround_fun(buf[i] * pow_fun(10.0F, (type)D_val) -           \
+                                                            min * pow_fun(10.0F, (type)D_val));              \
         else if (sizeof(type) == sizeof(long))                                                               \
             for (i = 0; i < d_nelmts; i++)                                                                   \
                 *(long *)((void *)&buf[i]) =                                                                 \
-                    lround_fun(buf[i] * pow_fun(10.0f, (type)D_val) - min * pow_fun(10.0f, (type)D_val));    \
+                    lround_fun(buf[i] * pow_fun(10.0F, (type)D_val) - min * pow_fun(10.0F, (type)D_val));    \
         else if (sizeof(type) == sizeof(long long))                                                          \
             for (i = 0; i < d_nelmts; i++)                                                                   \
                 *(long long *)((void *)&buf[i]) =                                                            \
-                    llround_fun(buf[i] * pow_fun(10.0f, (type)D_val) - min * pow_fun(10.0f, (type)D_val));   \
+                    llround_fun(buf[i] * pow_fun(10.0F, (type)D_val) - min * pow_fun(10.0F, (type)D_val));   \
         else                                                                                                 \
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
     }
@@ -606,8 +606,8 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
             H5Z_scaleoffset_get_filval_2(type, cd_values, filval)                                            \
                 H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val)                         \
                     H5Z_scaleoffset_check_3(i, type, pow_fun, round_fun, max, min, minbits, D_val) span =    \
-                        (unsigned long long)(llround_fun(max * pow_fun(10.0f, (type)D_val) -                 \
-                                                         min * pow_fun(10.0f, (type)D_val)) +                \
+                        (unsigned long long)(llround_fun(max * pow_fun(10.0F, (type)D_val) -                 \
+                                                         min * pow_fun(10.0F, (type)D_val)) +                \
                                              1);                                                             \
             *minbits = H5Z__scaleoffset_log2(span + 1);                                                      \
             if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */               \
@@ -617,8 +617,8 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
         else { /* fill value undefined */                                                                    \
             H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min)                                            \
                 H5Z_scaleoffset_check_3(i, type, pow_fun, round_fun, max, min, minbits, D_val) span =        \
-                    (unsigned long long)(llround_fun(max * pow_fun(10.0f, (type)D_val) -                     \
-                                                     min * pow_fun(10.0f, (type)D_val)) +                    \
+                    (unsigned long long)(llround_fun(max * pow_fun(10.0F, (type)D_val) -                     \
+                                                     min * pow_fun(10.0F, (type)D_val)) +                    \
                                          1);                                                                 \
             *minbits = H5Z__scaleoffset_log2(span);                                                          \
             if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */               \
@@ -685,19 +685,19 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
                 buf[i] =                                                                                     \
                     (type)((*(int *)((void *)&buf[i]) == (int)(((unsigned int)1 << minbits) - 1))            \
                                ? filval                                                                      \
-                               : (type)(*(int *)((void *)&buf[i])) / pow_fun(10.0f, (type)D_val) + min);     \
+                               : (type)(*(int *)((void *)&buf[i])) / pow_fun(10.0F, (type)D_val) + min);     \
         else if (sizeof(type) == sizeof(long))                                                               \
             for (i = 0; i < d_nelmts; i++)                                                                   \
                 buf[i] =                                                                                     \
                     (type)((*(long *)((void *)&buf[i]) == (long)(((unsigned long)1 << minbits) - 1))         \
                                ? filval                                                                      \
-                               : (type)(*(long *)((void *)&buf[i])) / pow_fun(10.0f, (type)D_val) + min);    \
+                               : (type)(*(long *)((void *)&buf[i])) / pow_fun(10.0F, (type)D_val) + min);    \
         else if (sizeof(type) == sizeof(long long))                                                          \
             for (i = 0; i < d_nelmts; i++)                                                                   \
                 buf[i] = (type)(                                                                             \
                     (*(long long *)((void *)&buf[i]) == (long long)(((unsigned long long)1 << minbits) - 1)) \
                         ? filval                                                                             \
-                        : (type)(*(long long *)((void *)&buf[i])) / pow_fun(10.0f, (type)D_val) + min);      \
+                        : (type)(*(long long *)((void *)&buf[i])) / pow_fun(10.0F, (type)D_val) + min);      \
         else                                                                                                 \
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
     }
@@ -707,13 +707,13 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
     {                                                                                                        \
         if (sizeof(type) == sizeof(int))                                                                     \
             for (i = 0; i < d_nelmts; i++)                                                                   \
-                buf[i] = ((type)(*(int *)((void *)&buf[i])) / pow_fun(10.0f, (type)D_val) + min);            \
+                buf[i] = ((type)(*(int *)((void *)&buf[i])) / pow_fun(10.0F, (type)D_val) + min);            \
         else if (sizeof(type) == sizeof(long))                                                               \
             for (i = 0; i < d_nelmts; i++)                                                                   \
-                buf[i] = ((type)(*(long *)((void *)&buf[i])) / pow_fun(10.0f, (type)D_val) + min);           \
+                buf[i] = ((type)(*(long *)((void *)&buf[i])) / pow_fun(10.0F, (type)D_val) + min);           \
         else if (sizeof(type) == sizeof(long long))                                                          \
             for (i = 0; i < d_nelmts; i++)                                                                   \
-                buf[i] = ((type)(*(long long *)((void *)&buf[i])) / pow_fun(10.0f, (type)D_val) + min);      \
+                buf[i] = ((type)(*(long long *)((void *)&buf[i])) / pow_fun(10.0F, (type)D_val) + min);      \
         else                                                                                                 \
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")                 \
     }
diff --git a/src/H5mpi.c b/src/H5mpi.c
index 9749721..4a8aa44 100644
--- a/src/H5mpi.c
+++ b/src/H5mpi.c
@@ -523,7 +523,7 @@ H5_mpio_create_large_type(hsize_t num_elements, MPI_Aint stride_bytes, MPI_Datat
             MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent);
         }
 
-        /* Set up the arguments for MPI_Type_struct constructor */
+        /* Set up the arguments for MPI_Type_create_struct() */
         type[0]      = outer_type;
         type[1]      = leftover_type;
         block_len[0] = 1;
diff --git a/src/H5private.h b/src/H5private.h
index 60fec4f..4b759f1 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -44,7 +44,9 @@
 #include <sys/time.h>
 #endif
 #ifdef H5_HAVE_UNISTD_H
+#ifdef H5_HAVE_PWD_H
 #include <pwd.h>
+#endif
 #include <unistd.h>
 #include <sys/wait.h>
 #endif
@@ -2083,6 +2085,8 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
     /* Push the API context */                                                                               \
     if (H5CX_push() < 0)                                                                                     \
         HGOTO_ERROR(H5E_FUNC, H5E_CANTSET, err, "can't set API context")                                     \
+    else                                                                                                     \
+        api_ctx_pushed = TRUE;                                                                               \
                                                                                                              \
     BEGIN_MPE_LOG
 
@@ -2090,6 +2094,8 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
 #define FUNC_ENTER_API(err)                                                                                  \
     {                                                                                                        \
         {                                                                                                    \
+            hbool_t api_ctx_pushed = FALSE;                                                                  \
+                                                                                                             \
             FUNC_ENTER_API_COMMON                                                                            \
             FUNC_ENTER_API_INIT(err);                                                                        \
             FUNC_ENTER_API_PUSH(err);                                                                        \
@@ -2104,6 +2110,8 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
 #define FUNC_ENTER_API_NOCLEAR(err)                                                                          \
     {                                                                                                        \
         {                                                                                                    \
+            hbool_t api_ctx_pushed = FALSE;                                                                  \
+                                                                                                             \
             FUNC_ENTER_API_COMMON                                                                            \
             FUNC_ENTER_API_INIT(err);                                                                        \
             FUNC_ENTER_API_PUSH(err);                                                                        \
@@ -2164,7 +2172,7 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
  * Use this macro for API functions that shouldn't perform _any_ initialization
  *      of the library or an interface, or push themselves on the function
  *      stack, or perform tracing, etc.  This macro _only_ sanity checks the
- *	API name itself.  Examples are: H5TSmutex_acquire,
+ *    API name itself.  Examples are: H5TSmutex_acquire,
  *
  */
 #define FUNC_ENTER_API_NAMECHECK_ONLY                                                                        \
@@ -2282,7 +2290,7 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
  * Use this macro for non-API functions that shouldn't perform _any_ initialization
  *      of the library or an interface, or push themselves on the function
  *      stack, or perform tracing, etc.  This macro _only_ sanity checks the
- *	API name itself.  Examples are private routines in the H5TS package.
+ *    API name itself.  Examples are private routines in the H5TS package.
  *
  */
 #define FUNC_ENTER_NOAPI_NAMECHECK_ONLY                                                                      \
@@ -2360,7 +2368,7 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
  * Use this macro for non-API functions that shouldn't perform _any_ initialization
  *      of the library or an interface, or push themselves on the function
  *      stack, or perform tracing, etc.  This macro _only_ sanity checks the
- *	API name itself.  Examples are static routines in the H5TS package.
+ *    API name itself.  Examples are static routines in the H5TS package.
  *
  */
 #define FUNC_ENTER_STATIC_NAMECHECK_ONLY                                                                     \
@@ -2392,14 +2400,17 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
     H5_API_SET_CANCEL
 
 #define FUNC_LEAVE_API_COMMON(ret_value)                                                                     \
-    ;                                                                                                        \
-    } /*end scope from end of FUNC_ENTER*/                                                                   \
     FINISH_MPE_LOG                                                                                           \
     H5TRACE_RETURN(ret_value);
 
 #define FUNC_LEAVE_API(ret_value)                                                                            \
+    ;                                                                                                        \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
     FUNC_LEAVE_API_COMMON(ret_value);                                                                        \
-    (void)H5CX_pop(TRUE);                                                                                    \
+    if (api_ctx_pushed) {                                                                                    \
+        (void)H5CX_pop(TRUE);                                                                                \
+        api_ctx_pushed = FALSE;                                                                              \
+    }                                                                                                        \
     H5_POP_FUNC                                                                                              \
     if (err_occurred)                                                                                        \
         (void)H5E_dump_api_stack(TRUE);                                                                      \
@@ -2410,6 +2421,8 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
 
 /* Use this macro to match the FUNC_ENTER_API_NOINIT macro */
 #define FUNC_LEAVE_API_NOINIT(ret_value)                                                                     \
+    ;                                                                                                        \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
     FUNC_LEAVE_API_COMMON(ret_value);                                                                        \
     H5_POP_FUNC                                                                                              \
     if (err_occurred)                                                                                        \
@@ -2422,6 +2435,8 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props);
 
 /* Use this macro to match the FUNC_ENTER_API_NOINIT_NOERR_NOFS macro */
 #define FUNC_LEAVE_API_NOFS(ret_value)                                                                       \
+    ;                                                                                                        \
+    } /*end scope from end of FUNC_ENTER*/                                                                   \
     FUNC_LEAVE_API_COMMON(ret_value);                                                                        \
     FUNC_LEAVE_API_THREADSAFE                                                                                \
     return (ret_value);                                                                                      \
diff --git a/src/H5public.h b/src/H5public.h
index e192de0..e7ed518 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -56,8 +56,12 @@
 
 #ifdef H5_HAVE_PARALLEL
 /* Don't link against MPI C++ bindings */
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX 1
-#define OMPI_SKIP_MPICXX  1
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX 1
+#endif
 #include <mpi.h>
 #ifndef MPI_FILE_NULL /* MPIO may be defined in mpi.h already */
 #include <mpio.h>
diff --git a/src/H5system.c b/src/H5system.c
index eba8341..fe379ad 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -958,8 +958,8 @@ const char *H5_optarg;     /* Flag argument (or value)               */
 int
 H5_get_option(int argc, const char **argv, const char *opts, const struct h5_long_options *l_opts)
 {
-    static int sp     = 1;   /* character index in current token */
-    int        optopt = '?'; /* option character passed back to user */
+    static int sp      = 1;   /* character index in current token */
+    int        optchar = '?'; /* option character passed back to user */
 
     if (sp == 1) {
         /* check for more flag-like tokens */
@@ -990,7 +990,7 @@ H5_get_option(int argc, const char **argv, const char *opts, const struct h5_lon
         for (i = 0; l_opts && l_opts[i].name; i++) {
             if (HDstrcmp(arg, l_opts[i].name) == 0) {
                 /* we've found a matching long command line flag */
-                optopt = l_opts[i].shortval;
+                optchar = l_opts[i].shortval;
 
                 if (l_opts[i].has_arg != no_arg) {
                     if (H5_optarg == NULL) {
@@ -1003,7 +1003,7 @@ H5_get_option(int argc, const char **argv, const char *opts, const struct h5_lon
                             if (H5_opterr)
                                 HDfprintf(stderr, "%s: option required for \"--%s\" flag\n", argv[0], arg);
 
-                            optopt = '?';
+                            optchar = '?';
                         }
                     }
                 }
@@ -1012,7 +1012,7 @@ H5_get_option(int argc, const char **argv, const char *opts, const struct h5_lon
                         if (H5_opterr)
                             HDfprintf(stderr, "%s: no option required for \"%s\" flag\n", argv[0], arg);
 
-                        optopt = '?';
+                        optchar = '?';
                     }
                 }
                 break;
@@ -1024,7 +1024,7 @@ H5_get_option(int argc, const char **argv, const char *opts, const struct h5_lon
             if (H5_opterr)
                 HDfprintf(stderr, "%s: unknown option \"%s\"\n", argv[0], arg);
 
-            optopt = '?';
+            optchar = '?';
         }
 
         H5_optind++;
@@ -1036,11 +1036,11 @@ H5_get_option(int argc, const char **argv, const char *opts, const struct h5_lon
         register char *cp; /* pointer into current token */
 
         /* short command line option */
-        optopt = argv[H5_optind][sp];
+        optchar = argv[H5_optind][sp];
 
-        if (optopt == ':' || (cp = HDstrchr(opts, optopt)) == 0) {
+        if (optchar == ':' || (cp = HDstrchr(opts, optchar)) == 0) {
             if (H5_opterr)
-                HDfprintf(stderr, "%s: unknown option \"%c\"\n", argv[0], optopt);
+                HDfprintf(stderr, "%s: unknown option \"%c\"\n", argv[0], optchar);
 
             /* if no chars left in this token, move to next token */
             if (argv[H5_optind][++sp] == '\0') {
@@ -1058,9 +1058,9 @@ H5_get_option(int argc, const char **argv, const char *opts, const struct h5_lon
             }
             else if (++H5_optind >= argc) {
                 if (H5_opterr)
-                    HDfprintf(stderr, "%s: value expected for option \"%c\"\n", argv[0], optopt);
+                    HDfprintf(stderr, "%s: value expected for option \"%c\"\n", argv[0], optchar);
 
-                optopt = '?';
+                optchar = '?';
             }
             else {
                 /* flag value is next token */
@@ -1098,5 +1098,5 @@ H5_get_option(int argc, const char **argv, const char *opts, const struct h5_lon
     }
 
     /* return the current flag character found */
-    return optopt;
+    return optchar;
 }
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 030b65b..44cf50c 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -80,7 +80,7 @@ struct timezone {
 #define HDstrtok_r(X, Y, Z)   strtok_s(X, Y, Z)
 #define HDtzset()             _tzset()
 #define HDunlink(S)           _unlink(S)
-#define HDunsetenv(N, V, O)   Wsetenv(N, "", 1)
+#define HDunsetenv(N)         Wsetenv(N, "", 1)
 #define HDwrite(F, M, Z)      _write(F, M, Z)
 
 #ifndef H5_HAVE_MINGW
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index a02bb00..3e81c5c 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -649,10 +649,10 @@ set_tests_properties (H5TEST-tcheck_version-minor PROPERTIES
     WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
     WILL_FAIL "true"
 )
+# release + 1 should pass
 add_test (NAME H5TEST-tcheck_version-release COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:tcheck_version> "-tr")
 set_tests_properties (H5TEST-tcheck_version-release PROPERTIES
     WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
-    WILL_FAIL "true"
 )
 
 ##############################################################################
diff --git a/test/ShellTests.cmake b/test/ShellTests.cmake
index 7212efb..4074299 100644
--- a/test/ShellTests.cmake
+++ b/test/ShellTests.cmake
@@ -19,7 +19,8 @@ if (UNIX)
 
   find_program (SH_PROGRAM bash)
   if (SH_PROGRAM)
-
+    set (srcdir ${HDF5_TEST_SOURCE_DIR})
+    set (bindir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     ##############################################################################
     #  configure scripts to test dir
     ##############################################################################
@@ -33,13 +34,8 @@ if (UNIX)
     ##############################################################################
     #  copy test programs to test dir
     ##############################################################################
-    add_custom_command (
-        TARGET     swmr_compat_vfd
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_check_compat_vfd>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_check_compat_vfd"
-    )
-
+    #shell script creates dir
+    #file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")
     add_custom_command (
         TARGET     output_filter.sh
         POST_BUILD
@@ -47,118 +43,12 @@ if (UNIX)
         ARGS       -E copy_if_different "${HDF5_SOURCE_DIR}/bin/output_filter.sh" "${HDF5_TEST_BINARY_DIR}/H5TEST/bin/output_filter.sh"
     )
 
-    file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/flushrefresh_test")
-    add_custom_command (
-        TARGET     flushrefresh
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:flushrefresh>" "${HDF5_TEST_BINARY_DIR}/H5TEST/flushrefresh"
-    )
-
     #shell script creates dir
     #file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/usecases_test")
-    add_custom_command (
-        TARGET     use_append_mchunks
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:use_append_mchunks>" "${HDF5_TEST_BINARY_DIR}/H5TEST/use_append_mchunks"
-    )
-    add_custom_command (
-        TARGET     use_disable_mdc_flushes
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:use_disable_mdc_flushes>" "${HDF5_TEST_BINARY_DIR}/H5TEST/use_disable_mdc_flushes"
-    )
-    add_custom_command (
-        TARGET     twriteorder
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:twriteorder>" "${HDF5_TEST_BINARY_DIR}/H5TEST/twriteorder"
-    )
-    add_custom_command (
-        TARGET     use_append_chunk
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:use_append_chunk>" "${HDF5_TEST_BINARY_DIR}/H5TEST/use_append_chunk"
-    )
 
     file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")
-    add_custom_command (
-        TARGET     swmr_generator
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_generator>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_generator"
-    )
-    add_custom_command (
-        TARGET     swmr_start_write
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_start_write>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_start_write"
-    )
-    add_custom_command (
-        TARGET     swmr_reader
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_reader>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_reader"
-    )
-    add_custom_command (
-        TARGET     swmr_writer
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_writer>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_writer"
-    )
-    add_custom_command (
-        TARGET     swmr_remove_reader
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_remove_reader>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_remove_reader"
-    )
-    add_custom_command (
-        TARGET     swmr_remove_writer
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_remove_writer>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_remove_writer"
-    )
-    add_custom_command (
-        TARGET     swmr_addrem_writer
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_addrem_writer>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_addrem_writer"
-    )
-    add_custom_command (
-        TARGET     swmr_sparse_reader
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_sparse_reader>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_sparse_reader"
-    )
-    add_custom_command (
-        TARGET     swmr_sparse_writer
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:swmr_sparse_writer>" "${HDF5_TEST_BINARY_DIR}/H5TEST/swmr_test/swmr_sparse_writer"
-    )
 
     file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/vds_swmr_test")
-    add_custom_command (
-        TARGET     vds_swmr_gen
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:vds_swmr_gen>" "${HDF5_TEST_BINARY_DIR}/H5TEST/vds_swmr_gen"
-    )
-    add_custom_command (
-        TARGET     vds_swmr_writer
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:vds_swmr_writer>" "${HDF5_TEST_BINARY_DIR}/H5TEST/vds_swmr_writer"
-    )
-    add_custom_command (
-        TARGET     vds_swmr_reader
-        POST_BUILD
-        COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different "$<TARGET_FILE:vds_swmr_reader>" "${HDF5_TEST_BINARY_DIR}/H5TEST/vds_swmr_reader"
-    )
-
-
 
     ##############################################################################
     ##############################################################################
diff --git a/test/big.c b/test/big.c
index 36fb27d..2bbae67 100644
--- a/test/big.c
+++ b/test/big.c
@@ -56,8 +56,8 @@
 #define DNAME "big.data"
 
 #define WRT_N       50
-#define WRT_SIZE    4 * 1024
-#define FAMILY_SIZE 1024 * 1024 * 1024
+#define WRT_SIZE    (4 * 1024)
+#define FAMILY_SIZE (1024 * 1024 * 1024)
 
 #define GB (HDoff_t)0x40000000L
 
diff --git a/test/cache_common.c b/test/cache_common.c
index 07c70f0..2d88e05 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -4994,7 +4994,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d
         }
         else {
 
-            expected_hit_rate = 0.0F;
+            expected_hit_rate = 0.0;
         }
 
         result = H5Fget_mdc_hit_rate(file_id, &hit_rate);
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index 4c3233d..8777096 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -110,8 +110,8 @@ typedef struct {
     long long r, s, t;
 } stype4;
 
-#define NX          100u
-#define NY          2000u
+#define NX          100U
+#define NY          2000U
 #define PACK_NMEMBS 100
 
 /*-------------------------------------------------------------------------
diff --git a/test/cve_2020_10810.h5 b/test/cve_2020_10810.h5
new file mode 100644
index 0000000..5cface3
--- /dev/null
+++ b/test/cve_2020_10810.h5
diff --git a/test/dsets.c b/test/dsets.c
index 26322ad..922f370 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1396,10 +1396,10 @@ test_conv_buffer(hid_t fid)
                 cf->a[j][k][l] = 10 * (j + 1) + l + k;
 
     for (j = 0; j < DIM2; j++)
-        cf->b[j] = 100.0f * (float)(j + 1) + 0.01f * (float)j;
+        cf->b[j] = 100.0F * (float)(j + 1) + 0.01F * (float)j;
 
     for (j = 0; j < DIM3; j++)
-        cf->c[j] = 100.0f * (float)(j + 1) + 0.02f * (float)j;
+        cf->c[j] = 100.0F * (float)(j + 1) + 0.02F * (float)j;
 
     /* Create data space */
     if ((space = H5Screate(H5S_SCALAR)) < 0)
@@ -3324,8 +3324,8 @@ test_nbit_float(hid_t file)
     /* orig_data[] are initialized to be within the range that can be represented by
      * dataset datatype (no precision loss during datatype conversion)
      */
-    float  orig_data[2][5] = {{188384.0f, 19.103516f, -1.0831790e9f, -84.242188f, 5.2045898f},
-                             {-49140.0f, 2350.25f, -3.2110596e-1f, 6.4998865e-5f, -0.0f}};
+    float  orig_data[2][5] = {{188384.0F, 19.103516F, -1.0831790e9F, -84.242188F, 5.2045898F},
+                             {-49140.0F, 2350.25F, -3.2110596e-1F, 6.4998865e-5F, -0.0F}};
     float  new_data[2][5];
     size_t precision, offset;
     size_t i, j;
@@ -11642,7 +11642,7 @@ test_unfiltered_edge_chunks(hid_t fapl)
         TEST_ERROR
 
     /* Add "count" filter */
-    if (H5Pset_filter(dcpl, H5Z_FILTER_COUNT, 0u, (size_t)0, NULL) < 0)
+    if (H5Pset_filter(dcpl, H5Z_FILTER_COUNT, 0U, (size_t)0, NULL) < 0)
         TEST_ERROR
 
     /* Disable filters on partial chunks */
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 7b79102..91e31d5 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -53,7 +53,7 @@ const char *FILENAME[] = {"dt_arith1", "dt_arith2", NULL};
  * endian.  If local variable `endian' is H5T_ORDER_BE then the result will
  * be I, otherwise the result will be Z-(I+1).
  */
-#define ENDIAN(Z, I, E) (H5T_ORDER_BE == E ? (I) : (Z) - ((I) + 1))
+#define ENDIAN(Z, I, E) (H5T_ORDER_BE == (E) ? (I) : (Z) - ((I) + 1))
 
 typedef enum dtype_t {
     INT_SCHAR,
@@ -3058,10 +3058,10 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
     /* Check the software results against the hardware */
     for (j = 0; j < nelmts; j++) {
         underflow = 0;
-        hw_f      = 911.0f;
-        hw_d      = 911.0f;
+        hw_f      = 911.0F;
+        hw_d      = 911.0F;
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
-        hw_ld = 911.0f;
+        hw_ld = 911.0L;
 #endif
 
         /* The hardware conversion */
diff --git a/test/dtransform.c b/test/dtransform.c
index 9445d83..8d3a8c0 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -32,30 +32,30 @@ hid_t dset_id_int_chunk   = -1;
 hid_t dset_id_float_chunk = -1;
 
 const float windchillFfloat[ROWS][COLS] = {
-    {36.0f, 31.0f, 25.0f, 19.0f, 13.0f, 7.0f, 1.0f, -5.0f, -11.0f, -16.0f, -22.0f, -28.0f, -34.0f, -40.0f,
-     -46.0f, -52.0f, -57.0f, -63.0f},
-    {34.0f, 27.0f, 21.0f, 15.0f, 9.0f, 3.0f, -4.0f, -10.0f, -16.0f, -22.0f, -28.0f, -35.0f, -41.0f, -47.0f,
-     -53.0f, -59.0f, -66.0f, -72.0f},
-    {32.0f, 25.0f, 19.0f, 13.0f, 6.0f, 0.0f, -7.0f, -13.0f, -19.0f, -26.0f, -32.0f, -39.0f, -45.0f, -51.0f,
-     -58.0f, -64.0f, -71.0f, -77.0f},
-    {30.0f, 24.0f, 17.0f, 11.0f, 4.0f, -2.0f, -9.0f, -15.0f, -22.0f, -29.0f, -35.0f, -42.0f, -48.0f, -55.0f,
-     -61.0f, -68.0f, -74.0f, -81.0f},
-    {29.0f, 23.0f, 16.0f, 9.0f, 3.0f, -4.0f, -11.0f, -17.0f, -24.0f, -31.0f, -37.0f, -44.0f, -51.0f, -58.0f,
-     -64.0f, -71.0f, -78.0f, -84.0f},
-    {28.0f, 22.0f, 15.0f, 8.0f, 1.0f, -5.0f, -12.0f, -19.0f, -26.0f, -33.0f, -39.0f, -46.0f, -53.0f, -60.0f,
-     -67.0f, -73.0f, -80.0f, -87.0f},
-    {28.0f, 21.0f, 14.0f, 7.0f, 0.0f, -7.0f, -14.0f, -21.0f, -27.0f, -34.0f, -41.0f, -48.0f, -55.0f, -62.0f,
-     -69.0f, -76.0f, -82.0f, -89.0f},
-    {27.0f, 20.0f, 13.0f, 6.0f, -1.0f, -8.0f, -15.0f, -22.0f, -29.0f, -36.0f, -43.0f, -50.0f, -57.0f, -64.0f,
-     -71.0f, -78.0f, -84.0f, -91.0f},
-    {26.0f, 19.0f, 12.0f, 5.0f, -2.0f, -9.0f, -16.0f, -23.0f, -30.0f, -37.0f, -44.0f, -51.0f, -58.0f, -65.0f,
-     -72.0f, -79.0f, -86.0f, -93.0f},
-    {26.0f, 19.0f, 12.0f, 4.0f, -3.0f, -10.0f, -17.0f, -24.0f, -31.0f, -38.0f, -45.0f, -52.0f, -60.0f, -67.0f,
-     -74.0f, -81.0f, -88.0f, -95.0f},
-    {25.0f, 18.0f, 11.0f, 4.0f, -3.0f, -11.0f, -18.0f, -25.0f, -32.0f, -39.0f, -46.0f, -54.0f, -61.0f, -68.0f,
-     -75.0f, -82.0f, -89.0f, -97.0f},
-    {25.0f, 17.0f, 10.0f, 3.0f, -4.0f, -11.0f, -19.0f, -26.0f, -33.0f, -40.0f, -48.0f, -55.0f, -62.0f, -69.0f,
-     -76.0f, -84.0f, -91.0f, -98.0f}};
+    {36.0F, 31.0F, 25.0F, 19.0F, 13.0F, 7.0F, 1.0F, -5.0F, -11.0F, -16.0F, -22.0F, -28.0F, -34.0F, -40.0F,
+     -46.0F, -52.0F, -57.0F, -63.0F},
+    {34.0F, 27.0F, 21.0F, 15.0F, 9.0F, 3.0F, -4.0F, -10.0F, -16.0F, -22.0F, -28.0F, -35.0F, -41.0F, -47.0F,
+     -53.0F, -59.0F, -66.0F, -72.0F},
+    {32.0F, 25.0F, 19.0F, 13.0F, 6.0F, 0.0F, -7.0F, -13.0F, -19.0F, -26.0F, -32.0F, -39.0F, -45.0F, -51.0F,
+     -58.0F, -64.0F, -71.0F, -77.0F},
+    {30.0F, 24.0F, 17.0F, 11.0F, 4.0F, -2.0F, -9.0F, -15.0F, -22.0F, -29.0F, -35.0F, -42.0F, -48.0F, -55.0F,
+     -61.0F, -68.0F, -74.0F, -81.0F},
+    {29.0F, 23.0F, 16.0F, 9.0F, 3.0F, -4.0F, -11.0F, -17.0F, -24.0F, -31.0F, -37.0F, -44.0F, -51.0F, -58.0F,
+     -64.0F, -71.0F, -78.0F, -84.0F},
+    {28.0F, 22.0F, 15.0F, 8.0F, 1.0F, -5.0F, -12.0F, -19.0F, -26.0F, -33.0F, -39.0F, -46.0F, -53.0F, -60.0F,
+     -67.0F, -73.0F, -80.0F, -87.0F},
+    {28.0F, 21.0F, 14.0F, 7.0F, 0.0F, -7.0F, -14.0F, -21.0F, -27.0F, -34.0F, -41.0F, -48.0F, -55.0F, -62.0F,
+     -69.0F, -76.0F, -82.0F, -89.0F},
+    {27.0F, 20.0F, 13.0F, 6.0F, -1.0F, -8.0F, -15.0F, -22.0F, -29.0F, -36.0F, -43.0F, -50.0F, -57.0F, -64.0F,
+     -71.0F, -78.0F, -84.0F, -91.0F},
+    {26.0F, 19.0F, 12.0F, 5.0F, -2.0F, -9.0F, -16.0F, -23.0F, -30.0F, -37.0F, -44.0F, -51.0F, -58.0F, -65.0F,
+     -72.0F, -79.0F, -86.0F, -93.0F},
+    {26.0F, 19.0F, 12.0F, 4.0F, -3.0F, -10.0F, -17.0F, -24.0F, -31.0F, -38.0F, -45.0F, -52.0F, -60.0F, -67.0F,
+     -74.0F, -81.0F, -88.0F, -95.0F},
+    {25.0F, 18.0F, 11.0F, 4.0F, -3.0F, -11.0F, -18.0F, -25.0F, -32.0F, -39.0F, -46.0F, -54.0F, -61.0F, -68.0F,
+     -75.0F, -82.0F, -89.0F, -97.0F},
+    {25.0F, 17.0F, 10.0F, 3.0F, -4.0F, -11.0F, -19.0F, -26.0F, -33.0F, -40.0F, -48.0F, -55.0F, -62.0F, -69.0F,
+     -76.0F, -84.0F, -91.0F, -98.0F}};
 
 const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, 28, 34, 40, 46, 52, 57, 63},
                                        {34, 27, 21, 15, 9, 3, 4, 10, 16, 22, 28, 35, 41, 47, 53, 59, 66, 1},
@@ -77,9 +77,9 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
         for (i = 0; i < ROWS; i++)                                                                           \
             for (j = 0; j < COLS; j++) {                                                                     \
                 if (!((((VAR1)[i][j] >= (TYPE)((VAR2)[i][j])) &&                                             \
-                       (((VAR1)[i][j] - TOL) < (TYPE)((VAR2)[i][j]))) ||                                     \
+                       (((VAR1)[i][j] - (TOL)) < (TYPE)((VAR2)[i][j]))) ||                                   \
                       (((VAR1)[i][j] <= (TYPE)((VAR2)[i][j])) &&                                             \
-                       (((VAR1)[i][j] + TOL) > (TYPE)((VAR2)[i][j]))))) {                                    \
+                       (((VAR1)[i][j] + (TOL)) > (TYPE)((VAR2)[i][j]))))) {                                  \
                     H5_FAILED();                                                                             \
                     HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");              \
                     goto error;                                                                              \
@@ -94,8 +94,8 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
                                                                                                              \
         for (i = 0; i < ROWS; i++)                                                                           \
             for (j = 0; j < COLS; j++) {                                                                     \
-                if (!(((VAR1)[i][j] <= ((TYPE)(VAR2)[i][j] + TOL)) &&                                        \
-                      ((VAR1)[i][j] >= ((TYPE)(VAR2)[i][j] - TOL)))) {                                       \
+                if (!(((VAR1)[i][j] <= ((TYPE)(VAR2)[i][j] + (TOL))) &&                                      \
+                      ((VAR1)[i][j] >= ((TYPE)(VAR2)[i][j] - (TOL))))) {                                     \
                     H5_FAILED();                                                                             \
                     HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");              \
                     goto error;                                                                              \
@@ -540,19 +540,19 @@ test_poly(const hid_t dxpl_id_polynomial)
 
     for (row = 0; row < ROWS; row++)
         for (col = 0; col < COLS; col++) {
-            windchillC          = (int)((5.0f / 9.0f) * (windchillFfloat[row][col] - 32));
-            polyflres[row][col] = ((2.0f + (float)windchillC) * (((float)windchillC - 8.0f) / 2.0f));
+            windchillC          = (int)((5.0F / 9.0F) * (windchillFfloat[row][col] - 32));
+            polyflres[row][col] = ((2.0F + (float)windchillC) * (((float)windchillC - 8.0F) / 2.0F));
         }
 
     TESTING("data transform, polynomial transform (int->float)")
     if (H5Dread(dset_id_int, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id_polynomial, polyflread) < 0)
         TEST_ERROR
 
-    COMPARE(float, polyflread, polyflres, 2.0f)
+    COMPARE(float, polyflread, polyflres, 2.0F)
 
     for (row = 0; row < ROWS; row++)
         for (col = 0; col < COLS; col++) {
-            windchillC          = (int)((5.0f / 9.0f) * (windchillFfloat[row][col] - 32));
+            windchillC          = (int)((5.0F / 9.0F) * (windchillFfloat[row][col] - 32));
             polyflres[row][col] = (float)((2 + windchillC) * ((windchillC - 8) / 2));
         }
 
@@ -752,7 +752,7 @@ test_copy(const hid_t dxpl_id_c_to_f_copy, const hid_t dxpl_id_polynomial_copy)
 
     for (row = 0; row < ROWS; row++)
         for (col = 0; col < COLS; col++) {
-            windchillC          = (int)((5.0f / 9.0f) * (windchillFfloat[row][col] - 32));
+            windchillC          = (int)((5.0F / 9.0F) * (windchillFfloat[row][col] - 32));
             polyflres[row][col] = (float)((2 + windchillC) * ((windchillC - 8) / 2));
         }
 
@@ -786,7 +786,7 @@ test_trivial(const hid_t dxpl_id_simple)
         TEST_ERROR
     for (row = 0; row < ROWS; row++)
         for (col = 0; col < COLS; col++) {
-            if ((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL)
+            if ((windchillFfloatread[row][col] - 4.8F) > FLOAT_TOL)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n");
         }
 
@@ -843,7 +843,7 @@ test_getset(const hid_t dxpl_id_c_to_f)
 
     for (row = 0; row < ROWS; row++)
         for (col = 0; col < COLS; col++) {
-            if ((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL)
+            if ((windchillFfloatread[row][col] - 4.8F) > FLOAT_TOL)
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n")
         }
 
diff --git a/test/dtypes.c b/test/dtypes.c
index 2a18302..8b3101c 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -70,7 +70,7 @@
         FAIL_STACK_ERROR                                                                                     \
     if ((NMEMBS) != H5I_nmembers(H5I_DATATYPE)) {                                                            \
         H5_FAILED();                                                                                         \
-        HDprintf("    #dtype ids expected: %lld; found: %lld\n", (long long)NMEMBS,                          \
+        HDprintf("    #dtype ids expected: %lld; found: %lld\n", (long long)(NMEMBS),                        \
                  (long long)H5I_nmembers(H5I_DATATYPE));                                                     \
         goto error;                                                                                          \
     }
@@ -6683,13 +6683,13 @@ static int
 test_int_float_except(void)
 {
 #if H5_SIZEOF_INT == 4 && H5_SIZEOF_FLOAT == 4
-    float  buf[CONVERT_SIZE]       = {(float)INT_MIN - 172.0f, (float)INT_MAX - 32.0f, (float)INT_MAX - 68.0f,
-                               (float)4.5f};
+    float  buf[CONVERT_SIZE]       = {(float)INT_MIN - 172.0F, (float)INT_MAX - 32.0F, (float)INT_MAX - 68.0F,
+                               (float)4.5F};
     int    buf_int[CONVERT_SIZE]   = {INT_MIN, INT_MAX, INT_MAX - 127, 4};
-    float  buf_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX + 1.0f, (float)INT_MAX - 127.0f, 4};
+    float  buf_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX + 1.0F, (float)INT_MAX - 127.0F, 4};
     int *  intp; /* Pointer to buffer, as integers */
     int    buf2[CONVERT_SIZE]       = {INT_MIN, INT_MAX, INT_MAX - 72, 0};
-    float  buf2_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX, (float)INT_MAX - 127.0f, (float)0.0f};
+    float  buf2_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX, (float)INT_MAX - 127.0F, (float)0.0F};
     int    buf2_int[CONVERT_SIZE]   = {INT_MIN, INT_MAX, INT_MAX - 127, 0};
     float *floatp;   /* Pointer to buffer #2, as floats */
     hid_t  dxpl;     /* Dataset transfer property list */
diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c
index 9b4879e..60b229a 100644
--- a/test/enc_dec_plist.c
+++ b/test/enc_dec_plist.c
@@ -350,7 +350,7 @@ main(void)
 
             TESTING("DXPL Encoding/Decoding");
 
-            if ((H5Pset_btree_ratios(dxpl, 0.2f, 0.6f, 0.2f)) < 0)
+            if ((H5Pset_btree_ratios(dxpl, 0.2, 0.6, 0.2)) < 0)
                 FAIL_STACK_ERROR
             if ((H5Pset_hyper_vector_size(dxpl, 5)) < 0)
                 FAIL_STACK_ERROR
@@ -544,7 +544,7 @@ main(void)
                 FAIL_STACK_ERROR
             if ((H5Pset_alignment(fapl, 2, 1024)) < 0)
                 FAIL_STACK_ERROR
-            if ((H5Pset_cache(fapl, 1024, 128, 10485760, 0.3f)) < 0)
+            if ((H5Pset_cache(fapl, 1024, 128, 10485760, 0.3)) < 0)
                 FAIL_STACK_ERROR
             if ((H5Pset_elink_file_cache_size(fapl, 10485760)) < 0)
                 FAIL_STACK_ERROR
diff --git a/test/fillval.c b/test/fillval.c
index 4215c89..8de6ef1 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -1050,7 +1050,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
         for (u = 0; u < nelmts; u++) {
             buf_c[u].a = 1111.11F;
             buf_c[u].x = 2222;
-            buf_c[u].y = 3333.3333F;
+            buf_c[u].y = 3333.3333;
             buf_c[u].z = 'd';
         }
         if (H5Dwrite(dset2, ctype_id, mspace, fspace, H5P_DEFAULT, buf_c) < 0)
@@ -1304,7 +1304,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
             goto error;
         HDmemset(&fill_ctype, 0, sizeof(fill_ctype));
-        fill_ctype.y = 4444.4444F;
+        fill_ctype.y = 4444.4444;
         if (H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0)
             goto error;
         nerrors += test_rdwr_cases(file, dcpl, "dset11", &fill_ctype, H5D_FILL_TIME_ALLOC, layout,
@@ -1370,7 +1370,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
         goto error;
     HDmemset(&fill_ctype, 0, sizeof(fill_ctype));
-    fill_ctype.y = 4444.4444F;
+    fill_ctype.y = 4444.4444;
     if (H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0)
         goto error;
     nerrors += test_rdwr_cases(file, dcpl, "dset12", &fill_ctype, H5D_FILL_TIME_ALLOC, layout, H5T_COMPOUND,
diff --git a/test/gheap.c b/test/gheap.c
index 95594ee..567fd65 100644
--- a/test/gheap.c
+++ b/test/gheap.c
@@ -503,7 +503,7 @@ test_ooo_indices(hid_t fapl)
                 GHEAP_REPEATED_ERR("    Unable to insert object into global heap")
 
             /* Check that the index is as expected */
-            if (obj[j].idx != ((1000 * i) + j - (1000 * ((~i & 1)))) % ((1u << 16) - 1) + 1)
+            if (obj[j].idx != ((1000 * i) + j - (1000 * ((~i & 1)))) % ((1U << 16) - 1) + 1)
                 GHEAP_REPEATED_ERR("    Unexpected global heap index");
         }
 
diff --git a/test/hyperslab.c b/test/hyperslab.c
index 1f57e3b..1c55259 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -585,10 +585,10 @@ test_multifill(size_t nx)
 
     for (i = 0; i < nx; i++) {
         src[i].left  = 1111111;
-        src[i].mid   = 12345.6789F;
+        src[i].mid   = 12345.6789;
         src[i].right = 2222222;
         dst[i].left  = 3333333;
-        dst[i].mid   = 98765.4321F;
+        dst[i].mid   = 98765.4321;
         dst[i].right = 4444444;
     } /* end for */
 
@@ -597,7 +597,7 @@ test_multifill(size_t nx)
      * over and over again.
      */
     fill.left  = 55555555;
-    fill.mid   = 3.1415927F;
+    fill.mid   = 3.1415927;
     fill.right = 66666666;
     src_stride = 0;
 
diff --git a/test/null_vol_connector.c b/test/null_vol_connector.c
index 2b375d8..6555763 100644
--- a/test/null_vol_connector.c
+++ b/test/null_vol_connector.c
@@ -116,6 +116,7 @@ static const H5VL_class_t null_vol_g = {
     {
         /* introspect_cls */
         NULL, /* get_conn_cls     */
+        NULL, /* get_cap_flags    */
         NULL, /* opt_query        */
     },
     {
diff --git a/test/ohdr.c b/test/ohdr.c
index b7af77f..afcea87 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -457,6 +457,59 @@ error:
 } /* test_ohdr_swmr() */
 
 /*
+ * Tests bad object header messages.
+ *
+ * Currently tests for CVE-2020-10810 fixes but can be expanded to handle
+ * other CVE badness.
+ */
+
+/* This is a generated file that can be obtained from:
+ *
+ * https://nvd.nist.gov/vuln/detail/CVE-2020-10810
+ *
+ * It was formerly named H5AC_unpin_entry_POC
+ */
+#define CVE_2020_10810_FILENAME "cve_2020_10810.h5"
+
+static herr_t
+test_ohdr_badness(hid_t fapl)
+{
+    hid_t fid = H5I_INVALID_HID;
+
+    /* CVE-2020-10810 involved a malformed fsinfo message
+     * This test ensures the fundamental problem is fixed. Running it under
+     * valgrind et al. will ensure that the memory leaks and invalid access
+     * are fixed.
+     */
+    TESTING("Fix for CVE-2020-10810");
+
+    H5E_BEGIN_TRY
+    {
+        /* This should fail due to the malformed fsinfo message. It should
+         * fail gracefully and not segfault.
+         */
+        fid = H5Fopen(CVE_2020_10810_FILENAME, H5F_ACC_RDWR, fapl);
+    }
+    H5E_END_TRY;
+
+    if (fid >= 0)
+        FAIL_PUTS_ERROR("should not have been able to open malformed file");
+
+    PASSED();
+
+    return SUCCEED;
+
+error:
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(fid);
+    }
+    H5E_END_TRY;
+
+    return FAIL;
+}
+
+/*
  *  To test objects with unknown messages in a file with:
  *      a) H5O_BOGUS_VALID_ID:
  *       --the bogus_id is within the range of H5O_msg_class_g[]
@@ -2047,6 +2100,9 @@ main(void)
         } /* high */
     }     /* low */
 
+    /* Verify bad ohdr message fixes work */
+    test_ohdr_badness(fapl);
+
     /* Verify symbol table messages are cached */
     if (h5_verify_cached_stabs(FILENAME, fapl) < 0)
         TEST_ERROR
diff --git a/test/pool.c b/test/pool.c
index 9ce1846..c508025 100644
--- a/test/pool.c
+++ b/test/pool.c
@@ -34,7 +34,7 @@
 #define MPOOL_LARGE_BLOCK       (MPOOL_PAGE_SIZE * 3)
 #define MPOOL_NUM_SMALL_BLOCKS  64
 #define MPOOL_SMALL_BLOCK       1
-#define MPOOL_NUM_RANDOM        10 * 1024
+#define MPOOL_NUM_RANDOM        (10 * 1024)
 #define MPOOL_RANDOM_MAX_SIZE   (MPOOL_PAGE_SIZE * 2)
 
 /*-------------------------------------------------------------------------
diff --git a/test/set_extent.c b/test/set_extent.c
index 5a07362..3078c2d 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -39,7 +39,7 @@ const char *FILENAME[] = {"set_extent1", "set_extent2", "set_extent3", "set_exte
 #define CONFIG_EARLY_ALLOC 0x04u
 #define CONFIG_UNFILT_EDGE 0x08u
 #define CONFIG_ALL         (CONFIG_COMPRESS + CONFIG_FILL + CONFIG_EARLY_ALLOC + CONFIG_UNFILT_EDGE)
-#define FILL_VALUE         -1
+#define FILL_VALUE         (-1)
 #define DO_RANKS_PRINT_CONFIG(TEST)                                                                          \
     {                                                                                                        \
         HDprintf("  Config:\n");                                                                             \
@@ -134,11 +134,11 @@ main(void)
         TEST_ERROR
 
     /* Set chunk cache so only part of the chunks can be cached on fapl */
-    if (H5Pset_cache(fapl, 0, (size_t)8, 256 * sizeof(int), 0.75F) < 0)
+    if (H5Pset_cache(fapl, 0, (size_t)8, 256 * sizeof(int), 0.75) < 0)
         TEST_ERROR
 
     /* Disable chunk caching on fapl2 */
-    if (H5Pset_cache(fapl2, 0, (size_t)0, (size_t)0, 0.0F) < 0)
+    if (H5Pset_cache(fapl2, 0, (size_t)0, (size_t)0, 0.0) < 0)
         TEST_ERROR
 
     /* Set the "use the latest version of the format" bounds for creating objects in the file */
diff --git a/test/tattr.c b/test/tattr.c
index b602222..756e139 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -95,8 +95,7 @@ int attr_data2[ATTR2_DIM1][ATTR2_DIM2] = {{7614, -416}, {197814, -3}}; /* Test d
 #define ATTR3_DIM2 2
 #define ATTR3_DIM3 2
 double attr_data3[ATTR3_DIM1][ATTR3_DIM2][ATTR3_DIM3] = {
-    {{2.3F, -26.1F}, {0.123F, -10.0F}},
-    {{973.23F, -0.91827F}, {2.0F, 23.0F}}}; /* Test data for 3rd attribute */
+    {{2.3, -26.1}, {0.123, -10.0}}, {{973.23, -0.91827}, {2.0, 23.0}}}; /* Test data for 3rd attribute */
 
 #define ATTR4_NAME       "Attr4"
 #define ATTR4_RANK       2
@@ -113,8 +112,8 @@ struct attr4_struct {
     double d;
     char   c;
 } attr_data4[ATTR4_DIM1][ATTR4_DIM2] = {
-    {{3, -26.1F, 'd'}, {-100000, 0.123F, '3'}},
-    {{-23, 981724.2F, 'Q'}, {0, 2.0F, '\n'}}}; /* Test data for 4th attribute */
+    {{3, -26.1, 'd'}, {-100000, 0.123, '3'}},
+    {{-23, 981724.2, 'Q'}, {0, 2.0, '\n'}}}; /* Test data for 4th attribute */
 
 #define ATTR5_NAME "Attr5"
 #define ATTR5_RANK 0
diff --git a/test/tconfig.c b/test/tconfig.c
index e3c6a2c..101de9a 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -37,8 +37,9 @@
 /* verify if the sizeof(type) matches size defined in macro. */
 /* Needs this extra step so that we can print the macro name. */
 #define vrfy_macrosize(type, macro, macroname)                                                               \
-    if (sizeof(type) != macro)                                                                               \
-        TestErrPrintf("Error: sizeof(%s) is %zu but %s is %d\n", #type, sizeof(type), macroname, (int)macro);
+    if (sizeof(type) != (macro))                                                                             \
+        TestErrPrintf("Error: sizeof(%s) is %zu but %s is %d\n", #type, sizeof(type), macroname,             \
+                      (int)(macro));
 
 /* local routine prototypes */
 void test_config_ctypes(void);
diff --git a/test/test_usecases.sh.in b/test/test_usecases.sh.in
index 30c93e9..5c7d46b 100644
--- a/test/test_usecases.sh.in
+++ b/test/test_usecases.sh.in
@@ -22,6 +22,12 @@
 # exit codes are okay (0).
 
 srcdir=@srcdir@
+bindir=@bindir@
+
+# If the bindir directory is not set just use current (.).
+if test -z "$bindir"; then
+   bindir=.
+fi
 
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
@@ -85,7 +91,7 @@ TOOLTEST() {
     # Run test.
     TESTING $program $@
     (
-      $RUNSERIAL ./$program "$@"
+      $RUNSERIAL $bindir/$program "$@"
     ) >$actual 2>$actual_err
     exit_code=$?
 
@@ -178,14 +184,14 @@ fi
 
 # main body
 for p in $USECASES_PROGRAMS; do
-    TOOLTEST ./$p
-    TOOLTEST ./$p -z 256
+    TOOLTEST $p
+    TOOLTEST $p -z 256
     tmpfile=/tmp/datatfile.$$
-    TOOLTEST ./$p -f $tmpfile; rm -f $tmpfile
-    TOOLTEST ./$p -l w
-    TOOLTEST ./$p -l r
+    TOOLTEST $p -f $tmpfile; rm -f $tmpfile
+    TOOLTEST $p -l w
+    TOOLTEST $p -l r
     # use case 1.9, testing with multi-planes chunks
-    TOOLTEST ./$p -z 256 -y 5    # 5 planes chunks
+    TOOLTEST $p -z 256 -y 5    # 5 planes chunks
     # cleanup temp datafile
     if test -z "$HDF5_NOCLEANUP"; then
     rm -f $p.h5
diff --git a/test/testcheck_version.sh.in b/test/testcheck_version.sh.in
index 43d1b46..6378ee5 100644
--- a/test/testcheck_version.sh.in
+++ b/test/testcheck_version.sh.in
@@ -15,7 +15,7 @@
 # Tests for the H5check_version function.
 #
 # Programmer: Albert Cheng
-#	      Sep 28, 2009
+#          Sep 28, 2009
 
 srcdir=@srcdir@
 
@@ -24,7 +24,7 @@ srcdir=@srcdir@
 Shared_Lib=@enable_shared@
 Static_Lib=@enable_static@
 Static_exec=@STATIC_EXEC@
-h5haveexitcode=yes	# default is yes
+h5haveexitcode=yes    # default is yes
 
 CMP='cmp -s'
 DIFF='diff -c'
@@ -103,10 +103,10 @@ WarnMesg2(){
 #     mismatch).
 #
 # Expected results:
-# 		Value of $HDF5_DISABLE_VERSION_CHECK
-#		unset	""	-1	0	1	2	3
-# Matched	OK	OK	OK	OK	OK	OK	OK
-# Mismatched	W/A	W/A	W/A	W/A	W2/OK	OK	W2/OK
+#         Value of $HDF5_DISABLE_VERSION_CHECK
+#        unset    ""    -1    0    1    2    3
+# Matched    OK    OK    OK    OK    OK    OK    OK
+# Mismatched    W/A    W/A    W/A    W/A    W2/OK    OK    W2/OK
 # Result codes:
 # OK:    No warning, exit 0.
 # W/A:   Warning, abort and exit non-0.
@@ -130,42 +130,42 @@ TESTING() {
     xxh5versrelease=$h5versrelease
 
     if [ "$h5DisableVersion" = unset ]; then
-	envcmd=""		# noop
+    envcmd=""        # noop
     else
-	envcmd="env HDF5_DISABLE_VERSION_CHECK=$h5DisableVersion"
+    envcmd="env HDF5_DISABLE_VERSION_CHECK=$h5DisableVersion"
     fi
 
     if [ "$wrongversionnumbers" = none ]; then
-	# OK: No warning, exit 0
-	cp /dev/null $expect
-	expect_code=0
+    # OK: No warning, exit 0
+    cp /dev/null $expect
+    expect_code=0
     else
-	arguments=-t"$wrongversionnumbers"
-	# calculate mismatched version numbers by listing.
-	case $wrongversionnumbers in
-	    "M")    xxh5versmajor=`expr $h5versmajor + 1`
-		    ;;
-	    "m")    xxh5versminor=`expr $h5versminor + 1`
-		    ;;
-	    "r")    xxh5versrelease=`expr $h5versrelease + 1`
-		    ;;
-	esac
-	case "$h5DisableVersion" in
-	    1)
-		# W2/OK: Different Warning, exit 0.
-		WarnMesg2 > $expect
-		expect_code=0
-		;;
-	    [2-9]|[1-9][0-9]*)
-		# OK: No warning, exit 0
-		cp /dev/null $expect
-		expect_code=0
-		;;
-	    *)	# W/A:   Warning, abort and exit non-0.
-		WarnMesg > $expect
-		expect_code=6	# Signal Abort exit code (128+6)
-		;;
-	esac
+    arguments=-t"$wrongversionnumbers"
+    # calculate mismatched version numbers by listing.
+    case $wrongversionnumbers in
+        "M")    xxh5versmajor=`expr $h5versmajor + 1`
+            ;;
+        "m")    xxh5versminor=`expr $h5versminor + 1`
+            ;;
+        "r")    xxh5versrelease=`expr $h5versrelease + 1`
+            ;;
+    esac
+    case "$h5DisableVersion" in
+        1)
+        # W2/OK: Different Warning, exit 0.
+        WarnMesg2 > $expect
+        expect_code=0
+        ;;
+        [2-9]|[1-9][0-9]*)
+        # OK: No warning, exit 0
+        cp /dev/null $expect
+        expect_code=0
+        ;;
+        *)    # W/A:   Warning, abort and exit non-0.
+        WarnMesg > $expect
+        expect_code=6    # Signal Abort exit code (128+6)
+        ;;
+    esac
     fi
 
     # Run test.
@@ -177,23 +177,23 @@ TESTING() {
     cat $actual_err >> $actual
 
     if [ $h5haveexitcode = 'yes' -a \( $expect_code -ne $ret_code \) ]; then
-	echo "*FAILED*"
-	echo "    Expected exit code ($expect_code) differs from actual code ($ret_code)"
-	nerrors="`expr $nerrors + 1`"
+    echo "*FAILED*"
+    echo "    Expected exit code ($expect_code) differs from actual code ($ret_code)"
+    nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-	echo " PASSED"
+    echo " PASSED"
     else
-	echo "*FAILED*"
-	echo "    Expected result differs from actual result"
-	nerrors="`expr $nerrors + 1`"
-	test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    echo "*FAILED*"
+    echo "    Expected result differs from actual result"
+    nerrors="`expr $nerrors + 1`"
+    test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file.
     # Also clean the core file generated by H5check_version's abort.
     if test -z "$HDF5_NOCLEANUP"; then
-	$RM $expect $actual $actual_err
-	$RM core
+    $RM $expect $actual $actual_err
+    $RM core
     fi
 }
 
@@ -201,15 +201,15 @@ TESTING() {
 # Echo parameters for debugging if verbose mode is on.
 DEBUGPRINT() {
     if [ -n "$debugmode" ]; then
-	echo $*
+    echo $*
     fi
 }
 
 
 # MAIN Body
 nerrors=0
-verbose=yes	# default on
-debugmode=	# default off
+verbose=yes    # default on
+debugmode=    # default off
 H5_HAVE_EMBEDDED_LIBINFO=`grep '#define H5_HAVE_EMBEDDED_LIBINFO ' ../src/H5pubconf.h`
 h5libsettings=../src/libhdf5.settings
 
@@ -240,13 +240,13 @@ fi
 # Three Categories of tests:
 # Normal: where the version numbers all matched (wrong_version == none).
 # Mismatched version numbers (could be Major or minor version
-#	or release numbers or a combination of all three.)
+#    or release numbers or a combination of all three.)
 # Test all the above with different values of the environment variable,
 # HDF5_DISABLE_VERSION_CHECK, as unset, "", -1, 0, 1, 2, 3
 
 for val_disable_version_check in unset "" -1 0 1 2 3; do
-    for wrong_version in none M m r; do
-	TESTING "$val_disable_version_check" "$wrong_version"
+    for wrong_version in none M m; do
+    TESTING "$val_disable_version_check" "$wrong_version"
     done
 done
 
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 5fb01a8..ba5fa71 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -136,7 +136,7 @@
                        "%s \n",                                                                              \
                        (where), (int)__LINE__, __FILE__, x);                                                 \
         }                                                                                                    \
-        if (HDstrcmp(x, val)) {                                                                              \
+        if (HDstrcmp(x, val) != 0) {                                                                         \
             TestErrPrintf("*** UNEXPECTED VALUE from %s should be %s, but is %s at line %4d "                \
                           "in %s\n",                                                                         \
                           where, val, x, (int)__LINE__, __FILE__);                                           \
diff --git a/test/testswmr.sh.in b/test/testswmr.sh.in
index 0cba2ef..666cc8d 100644
--- a/test/testswmr.sh.in
+++ b/test/testswmr.sh.in
@@ -17,6 +17,7 @@
 #   Albert Cheng, 2009/07/22
 
 srcdir=@srcdir@
+bindir=@bindir@
 
 ###############################################################################
 ## test parameters
@@ -97,6 +98,11 @@ if test -z "$srcdir"; then
    srcdir=.
 fi
 
+# If the bindir directory is not set just use current (.).
+if test -z "$bindir"; then
+   bindir=.
+fi
+
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
 ../utils/swmr_compat_vfd
@@ -172,7 +178,7 @@ do
         echo "###############################################################################"
         # Launch the Generator without SWMR_WRITE
         echo launch the swmr_generator
-        ./swmr_generator $compress $index_type
+        $bindir/swmr_generator $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -180,7 +186,7 @@ do
 
         # Launch the Generator with SWMR_WRITE
         echo launch the swmr_generator with SWMR_WRITE
-        ./swmr_generator -s $compress $index_type
+        $bindir/swmr_generator -s $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -204,7 +210,7 @@ do
         # Launch the Writer
         echo launch the swmr_start_writer
         seed="" # Put -r <random seed> command here
-        ./swmr_start_write $compress $index_type $Nrecords $seed 2>&1 |tee swmr_writer.out &
+        $bindir/swmr_start_write $compress $index_type $Nrecords $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -220,7 +226,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            ./swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
+            $bindir/swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -265,7 +271,7 @@ do
 
         # Launch the Generator
         echo launch the swmr_generator
-        ./swmr_generator -s $compress $index_type
+        $bindir/swmr_generator -s $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -277,7 +283,7 @@ do
         # Launch the Writer
         echo launch the swmr_writer
         seed="" # Put -r <random seed> command here
-        ./swmr_writer -o $Nrecords $seed 2>&1 |tee swmr_writer.out &
+        $bindir/swmr_writer -o $Nrecords $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -292,7 +298,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            ./swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
+            $bindir/swmr_reader $Nsecs_add $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -340,7 +346,7 @@ do
         # Launch the Remove Writer
         echo launch the swmr_remove_writer
         seed="" # Put -r <random seed> command here
-        ./swmr_remove_writer -o $Nrecs_rem $seed 2>&1 |tee swmr_writer.out &
+        $bindir/swmr_remove_writer -o $Nrecs_rem $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -355,7 +361,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            ./swmr_remove_reader $Nsecs_rem $seed 2>&1 |tee swmr_reader.out.$n &
+            $bindir/swmr_remove_reader $Nsecs_rem $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -400,7 +406,7 @@ do
 
         # Launch the Generator
         echo launch the swmr_generator
-        ./swmr_generator $compress $index_type
+        $bindir/swmr_generator $compress $index_type
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -409,7 +415,7 @@ do
         # Launch the Writer (not in parallel - just to rebuild the datasets)
         echo launch the swmr_writer
         seed="" # Put -r <random seed> command here
-        ./swmr_writer $Nrecords $seed
+        $bindir/swmr_writer $Nrecords $seed
         if test $? -ne 0; then
             echo writer had error
             nerrors=`expr $nerrors + 1`
@@ -421,7 +427,7 @@ do
         # Launch the Add/Remove Writer
         echo launch the swmr_addrem_writer
         seed="" # Put -r <random seed> command here
-        ./swmr_addrem_writer $Nrecords $seed 2>&1 |tee swmr_writer.out &
+        $bindir/swmr_addrem_writer $Nrecords $seed 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -436,7 +442,7 @@ do
         while [ $n -lt $Nreaders ]; do
             #seed="-r ${seeds[$n]}"
             seed=""
-            ./swmr_remove_reader $Nsecs_addrem $seed 2>&1 |tee swmr_reader.out.$n &
+            $bindir/swmr_remove_reader $Nsecs_addrem $seed 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
@@ -484,7 +490,7 @@ do
         #       created by the generator.
         echo launch the swmr_generator
         seed="" # Put -r <random seed> command here
-        ./swmr_generator $compress $index_type $seed
+        $bindir/swmr_generator $compress $index_type $seed
         if test $? -ne 0; then
             echo generator had error
             nerrors=`expr $nerrors + 1`
@@ -494,7 +500,7 @@ do
         rm -f $WRITER_MESSAGE
         # Launch the Sparse writer
         echo launch the swmr_sparse_writer
-        nice -n 20 ./swmr_sparse_writer $Nrecs_spa 2>&1 |tee swmr_writer.out &
+        nice -n 20 $bindir/swmr_sparse_writer $Nrecs_spa 2>&1 |tee swmr_writer.out &
         pid_writer=$!
         $DPRINT pid_writer=$pid_writer
 
@@ -507,7 +513,7 @@ do
         echo launch $Nrdrs_spa swmr_sparse_readers
         while [ $n -lt $Nrdrs_spa ]; do
             # The sparse reader spits out a LOT of data so it's set to 'quiet'
-            ./swmr_sparse_reader -q $Nrecs_spa 2>&1 |tee swmr_reader.out.$n &
+            $bindir/swmr_sparse_reader -q $Nrecs_spa 2>&1 |tee swmr_reader.out.$n &
             pid_readers="$pid_readers $!"
             n=`expr $n + 1`
         done
diff --git a/test/testvdsswmr.sh.in b/test/testvdsswmr.sh.in
index 7eb69bd..ed1f184 100644
--- a/test/testvdsswmr.sh.in
+++ b/test/testvdsswmr.sh.in
@@ -17,6 +17,7 @@
 #   Dana Robinson, November 2015
 
 srcdir=@srcdir@
+bindir=@bindir@
 
 ###############################################################################
 ## test parameters
@@ -30,7 +31,7 @@ nerrors=0
 ## definitions for message file to coordinate test runs
 ###############################################################################
 WRITER_MESSAGE=SWMR_WRITER_MESSAGE      # The message file created by writer that the open is complete
-                                        # This should be the same as the define in "./swmr_common.h"
+                                        # This should be the same as the define in "$bindir/swmr_common.h"
 MESSAGE_TIMEOUT=300                     # Message timeout length in secs
                                         # This should be the same as the define in "./h5test.h"
 
@@ -83,6 +84,11 @@ if test -z "$srcdir"; then
    srcdir=.
 fi
 
+# If the bindir directory is not set just use current (.).
+if test -z "$bindir"; then
+   bindir=.
+fi
+
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
 ../utils/swmr_compat_vfd
@@ -164,7 +170,7 @@ echo "##########################################################################
 
 # Launch the file generator
 echo launch the generator
-./vds_swmr_gen
+$bindir/vds_swmr_gen
 if test $? -ne 0; then
     echo generator had error
     nerrors=`expr $nerrors + 1`
@@ -182,7 +188,7 @@ echo "launch the $Nwriters SWMR VDS writers (1 per source)"
 pid_writers=""
 n=0
 while [ $n -lt $Nwriters ]; do
-    ./vds_swmr_writer $n &
+    $bindir/vds_swmr_writer $n &
     pid_writers="$pid_writers $!"
     n=`expr $n + 1`
 done
@@ -197,7 +203,7 @@ echo launch $Nreaders SWMR readers
 pid_readers=""
 n=0
 while [ $n -lt $Nreaders ]; do
-    ./vds_swmr_reader &
+    $bindir/vds_swmr_reader &
     pid_readers="$pid_readers $!"
     n=`expr $n + 1`
 done
diff --git a/test/tfile.c b/test/tfile.c
index 62f3c73..0014d08 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -125,7 +125,7 @@
 #define TEST_THRESHOLD10 10                         /* Free space section threshold */
 #define FSP_SIZE_DEF     4096                       /* File space page size default */
 #define FSP_SIZE512      512                        /* File space page size */
-#define FSP_SIZE1G       1024 * 1024 * 1024         /* File space page size */
+#define FSP_SIZE1G       (1024 * 1024 * 1024)       /* File space page size */
 
 /* Declaration for test_libver_macros2() */
 #define FILE6 "tfile6.h5" /* Test file */
diff --git a/test/timer.c b/test/timer.c
index bb474ca..11b7427 100644
--- a/test/timer.c
+++ b/test/timer.c
@@ -43,55 +43,55 @@ test_time_formatting(void)
     TESTING("Time string formats");
 
     /*      < 0,            N/A             */
-    s = H5_timer_get_time_string(-1.0F);
+    s = H5_timer_get_time_string(-1.0);
     if (NULL == s || HDstrcmp(s, "N/A") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      0               0               */
-    s = H5_timer_get_time_string(0.0F);
+    s = H5_timer_get_time_string(0.0);
     if (NULL == s || HDstrcmp(s, "0.0 s") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      < 1 us          nanoseconds     */
-    s = H5_timer_get_time_string(123.0E-9F);
+    s = H5_timer_get_time_string(123.0E-9);
     if (NULL == s || HDstrcmp(s, "123 ns") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      < 1 ms          microseconds    */
-    s = H5_timer_get_time_string(23.456E-6F);
+    s = H5_timer_get_time_string(23.456E-6);
     if (NULL == s || HDstrcmp(s, "23.5 us") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      < 1 s           milliseconds    */
-    s = H5_timer_get_time_string(4.56789E-3F);
+    s = H5_timer_get_time_string(4.56789E-3);
     if (NULL == s || HDstrcmp(s, "4.6 ms") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      < 1 min         seconds         */
-    s = H5_timer_get_time_string(3.14F);
+    s = H5_timer_get_time_string(3.14);
     if (NULL == s || HDstrcmp(s, "3.14 s") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      < 1 hr          mins, secs      */
-    s = H5_timer_get_time_string(2521.0F);
+    s = H5_timer_get_time_string(2521.0);
     if (NULL == s || HDstrcmp(s, "42 m 1 s") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      < 1 d           hrs, mins, secs */
-    s = H5_timer_get_time_string(9756.0F);
+    s = H5_timer_get_time_string(9756.0);
     if (NULL == s || HDstrcmp(s, "2 h 42 m 36 s") != 0)
         TEST_ERROR;
     HDfree(s);
 
     /*      > 1 d            days, hrs, mins, secs */
-    s = H5_timer_get_time_string(280802.0F);
+    s = H5_timer_get_time_string(280802.0);
     if (NULL == s || HDstrcmp(s, "3 d 6 h 0 m 2 s") != 0)
         TEST_ERROR;
     HDfree(s);
diff --git a/test/tmeta.c b/test/tmeta.c
index 2609703..e70db16 100644
--- a/test/tmeta.c
+++ b/test/tmeta.c
@@ -22,9 +22,9 @@
 #include "testhdf5.h"
 #include "H5Fprivate.h"
 
-#define TEST_INT16_VALUE  -7641
+#define TEST_INT16_VALUE  (-7641)
 #define TEST_UINT16_VALUE 45002
-#define TEST_INT32_VALUE  -981236
+#define TEST_INT32_VALUE  (-981236)
 #define TEST_UINT32_VALUE 3476589
 
 uint8_t compar_buffer[] = {
diff --git a/test/tmisc.c b/test/tmisc.c
index 302da0d..b267330 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -5276,7 +5276,7 @@ test_misc28(void)
      * bytes). */
     fapl = H5Pcreate(H5P_FILE_ACCESS);
     CHECK(fapl, FAIL, "H5Pcreate");
-    ret = H5Pset_cache(fapl, MISC28_NSLOTS, MISC28_NSLOTS, MISC28_SIZE, 0.75F);
+    ret = H5Pset_cache(fapl, MISC28_NSLOTS, MISC28_NSLOTS, MISC28_SIZE, 0.75);
     CHECK(ret, FAIL, "H5Pset_cache");
 
     /* Create the dcpl and set the chunk size */
diff --git a/test/tsohm.c b/test/tsohm.c
index c055e21..f4073c4 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -623,7 +623,7 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_
             HDprintf("Can't read data\n");                                                                   \
             goto error;                                                                                      \
         }                                                                                                    \
-        if ((rdata.i1 != wdata.i1) || (rdata.i2 != wdata.i2) || HDstrcmp(rdata.str, wdata.str)) {            \
+        if ((rdata.i1 != wdata.i1) || (rdata.i2 != wdata.i2) || HDstrcmp(rdata.str, wdata.str) != 0) {       \
             H5_FAILED();                                                                                     \
             AT();                                                                                            \
             HDprintf("incorrect read data\n");                                                               \
diff --git a/test/tunicode.c b/test/tunicode.c
index 52341bb..1b696ac 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -33,7 +33,7 @@
 
 #define RANK            1
 #define COMP_INT_VAL    7
-#define COMP_FLOAT_VAL  -42.0F
+#define COMP_FLOAT_VAL  (-42.0F)
 #define COMP_DOUBLE_VAL 42.0F
 
 /* Test function prototypes */
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 50b2d7a..03a8ad3 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -2526,10 +2526,10 @@ test_vltypes_fill_value(void)
     hsize_t             small_dims[] = {SPACE4_DIM_SMALL};
     hsize_t             large_dims[] = {SPACE4_DIM_LARGE};
     size_t              dset_elmts   = 0; /* Number of elements in a particular dataset */
-    const dtype1_struct fill1        = {1, 2,    "foobar", "",   NULL,     "\0",   "dead",
-                                 3, 4.0F, 100.0F,   1.0F, "liquid", "meter"};
-    const dtype1_struct wdata = {3, 4, "", NULL, "\0", "foo", "two", 6, 8.0F, 200.0F, 2.0F, "solid", "yard"};
-    dtype1_struct *     rbuf  = NULL;                   /* Buffer for reading data */
+    const dtype1_struct fill1        = {1, 2,   "foobar", "",  NULL,     "\0",   "dead",
+                                 3, 4.0, 100.0,    1.0, "liquid", "meter"};
+    const dtype1_struct wdata    = {3, 4, "", NULL, "\0", "foo", "two", 6, 8.0, 200.0, 2.0, "solid", "yard"};
+    dtype1_struct *     rbuf     = NULL;                /* Buffer for reading data */
     size_t              mem_used = 0;                   /* Memory used during allocation */
     H5D_layout_t        layout;                         /* Dataset storage layout */
     char                dset_name1[64], dset_name2[64]; /* Dataset names */
diff --git a/test/vds.c b/test/vds.c
index f2de940..6927b82 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -78,12 +78,12 @@ char vds_test_str_g[128]   = "";
 #endif /* VDS_TEST_VERBOSE */
 
 /* I/O test config flags */
-#define TEST_IO_CLOSE_SRC      0x01u
-#define TEST_IO_DIFFERENT_FILE 0x02u
-#define TEST_IO_REOPEN_VIRT    0x04u
-#define TEST_IO_FCLOSE_SEMI    0x08u
-#define TEST_IO_FCLOSE_STRONG  0x10u
-#define TEST_IO_NTESTS         0x20u
+#define TEST_IO_CLOSE_SRC      0x01U
+#define TEST_IO_DIFFERENT_FILE 0x02U
+#define TEST_IO_REOPEN_VIRT    0x04U
+#define TEST_IO_FCLOSE_SEMI    0x08U
+#define TEST_IO_FCLOSE_STRONG  0x10U
+#define TEST_IO_NTESTS         0x20U
 
 #define LIST_DOUBLE_SIZE (H5D_VIRTUAL_DEF_LIST_SIZE + 1)
 
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 43ded12..2d6c66c 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -104,9 +104,9 @@ static hbool_t not_comparable;
         per            = -1;                                                                                 \
         not_comparable = FALSE;                                                                              \
         both_zero      = FALSE;                                                                              \
-        if (H5_DBL_ABS_EQUAL(0, (double)A) && H5_DBL_ABS_EQUAL(0, (double)B))                                \
+        if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B)))                            \
             both_zero = TRUE;                                                                                \
-        if (!H5_DBL_ABS_EQUAL(0, (double)A))                                                                 \
+        if (!H5_DBL_ABS_EQUAL(0, (double)(A)))                                                               \
             per = (double)ABS((double)((B) - (A)) / (double)(A));                                            \
         else                                                                                                 \
             not_comparable = TRUE;                                                                           \
@@ -117,9 +117,9 @@ static hbool_t not_comparable;
         per            = -1;                                                                                 \
         not_comparable = FALSE;                                                                              \
         both_zero      = FALSE;                                                                              \
-        if (H5_DBL_ABS_EQUAL(0, (double)A) && H5_DBL_ABS_EQUAL(0, (double)B))                                \
+        if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B)))                            \
             both_zero = TRUE;                                                                                \
-        if (!H5_DBL_ABS_EQUAL(0, (double)A))                                                                 \
+        if (!H5_DBL_ABS_EQUAL(0, (double)(A)))                                                               \
             per = ABS((double)((TYPE)((B) - (A))) / (double)(A));                                            \
         else                                                                                                 \
             not_comparable = TRUE;                                                                           \
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
index 8c3e361..e291f61 100644
--- a/tools/src/CMakeLists.txt
+++ b/tools/src/CMakeLists.txt
@@ -13,7 +13,7 @@ add_subdirectory (misc)
 #-- Add the h5import and test executables
 add_subdirectory (h5import)
 
-#-- h5Repack executables
+#-- h5repack executables
 add_subdirectory (h5repack)
 
 #-- Add the h5dump and test executables
@@ -30,3 +30,6 @@ add_subdirectory (h5dump)
 
 #-- Add the h5format_convert and test executables
 add_subdirectory (h5format_convert)
+
+#-- h5perf executables
+add_subdirectory (h5perf)
diff --git a/tools/src/Makefile.am b/tools/src/Makefile.am
index 397bd31..5af7d06 100644
--- a/tools/src/Makefile.am
+++ b/tools/src/Makefile.am
@@ -23,6 +23,6 @@ CONFIG=ordered
 
 # All subdirectories
 SUBDIRS=h5diff h5ls h5dump misc h5import h5repack h5jam h5copy \
-	h5format_convert h5stat
+	h5format_convert h5stat h5perf
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 70f03df..36114ba 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -82,124 +82,46 @@ struct handler_t {
 /* "xxx" "yyy" into "xxxyyy". */
 static const char *           s_opts   = "a:b*c:d:ef:g:hik:l:m:n*o*pq:rs:t:uvw:xyz:A*BCD:E*F:G:HM:N:O*RS:VX:";
 static struct h5_long_options l_opts[] = {{"attribute", require_arg, 'a'},
-                                          {"attribut", require_arg, 'a'},
-                                          {"attribu", require_arg, 'a'},
-                                          {"attrib", require_arg, 'a'},
-                                          {"attri", require_arg, 'a'},
-                                          {"attr", require_arg, 'a'},
-                                          {"att", require_arg, 'a'},
-                                          {"at", require_arg, 'a'},
                                           {"binary", optional_arg, 'b'},
                                           {"count", require_arg, 'c'},
-                                          {"coun", require_arg, 'c'},
-                                          {"cou", require_arg, 'c'},
-                                          {"co", require_arg, 'c'},
                                           {"dataset", require_arg, 'd'},
-                                          {"datase", require_arg, 'd'},
-                                          {"datas", require_arg, 'd'},
                                           {"escape", no_arg, 'e'},
                                           {"filedriver", require_arg, 'f'},
-                                          {"filedrive", require_arg, 'f'},
-                                          {"filedriv", require_arg, 'f'},
-                                          {"filedri", require_arg, 'f'},
-                                          {"filedr", require_arg, 'f'},
-                                          {"filed", require_arg, 'f'},
-                                          {"file", require_arg, 'f'},
-                                          {"fil", require_arg, 'f'},
-                                          {"fi", require_arg, 'f'},
                                           {"group", require_arg, 'g'},
-                                          {"grou", require_arg, 'g'},
-                                          {"gro", require_arg, 'g'},
-                                          {"gr", require_arg, 'g'},
                                           {"help", no_arg, 'h'},
-                                          {"hel", no_arg, 'h'},
                                           {"object-ids", no_arg, 'i'},
-                                          {"object-id", no_arg, 'i'},
-                                          {"object-i", no_arg, 'i'},
-                                          {"object", no_arg, 'i'},
-                                          {"objec", no_arg, 'i'},
-                                          {"obje", no_arg, 'i'},
-                                          {"obj", no_arg, 'i'},
-                                          {"ob", no_arg, 'i'},
                                           {"block", require_arg, 'k'},
-                                          {"bloc", require_arg, 'k'},
-                                          {"blo", require_arg, 'k'},
-                                          {"bl", require_arg, 'k'},
                                           {"soft-link", require_arg, 'l'},
-                                          {"soft-lin", require_arg, 'l'},
-                                          {"soft-li", require_arg, 'l'},
-                                          {"soft-l", require_arg, 'l'},
-                                          {"soft", require_arg, 'l'},
-                                          {"sof", require_arg, 'l'},
                                           {"format", require_arg, 'm'},
                                           {"contents", optional_arg, 'n'},
                                           {"output", optional_arg, 'o'},
-                                          {"outpu", optional_arg, 'o'},
-                                          {"outp", optional_arg, 'o'},
-                                          {"out", optional_arg, 'o'},
-                                          {"ou", optional_arg, 'o'},
                                           {"properties", no_arg, 'p'},
                                           {"sort_by", require_arg, 'q'},
                                           {"string", no_arg, 'r'},
-                                          {"strin", no_arg, 'r'},
                                           {"start", require_arg, 's'},
-                                          {"star", require_arg, 's'},
-                                          {"sta", require_arg, 's'},
                                           {"datatype", require_arg, 't'},
-                                          {"datatyp", require_arg, 't'},
-                                          {"dataty", require_arg, 't'},
-                                          {"datat", require_arg, 't'},
                                           {"use-dtd", no_arg, 'u'},
-                                          {"use-dt", no_arg, 'u'},
-                                          {"use-d", no_arg, 'u'},
-                                          {"use-", no_arg, 'u'},
-                                          {"use", no_arg, 'u'},
-                                          {"us", no_arg, 'u'},
-                                          {"u", no_arg, 'u'},
                                           {"vds-view-first-missing", no_arg, 'v'},
                                           {"width", require_arg, 'w'},
-                                          {"widt", require_arg, 'w'},
-                                          {"wid", require_arg, 'w'},
-                                          {"wi", require_arg, 'w'},
                                           {"xml", no_arg, 'x'},
-                                          {"xm", no_arg, 'x'},
                                           {"noindex", no_arg, 'y'},
                                           {"sort_order", require_arg, 'z'},
                                           {"onlyattr", optional_arg, 'A'},
                                           {"superblock", no_arg, 'B'},
                                           {"boot-block", no_arg, 'B'},
-                                          {"boot-bloc", no_arg, 'B'},
-                                          {"boot-blo", no_arg, 'B'},
-                                          {"boot-bl", no_arg, 'B'},
-                                          {"boot-b", no_arg, 'B'},
-                                          {"boot", no_arg, 'B'},
-                                          {"boo", no_arg, 'B'},
-                                          {"bo", no_arg, 'B'},
                                           {"no-compact-subset", no_arg, 'C'},
                                           {"xml-dtd", require_arg, 'D'},
-                                          {"xml-dt", require_arg, 'D'},
-                                          {"xml-d", require_arg, 'D'},
                                           {"enable-error-stack", optional_arg, 'E'},
                                           {"form", require_arg, 'F'},
                                           {"vds-gap-size", require_arg, 'G'},
                                           {"header", no_arg, 'H'},
-                                          {"heade", no_arg, 'H'},
-                                          {"head", no_arg, 'H'},
-                                          {"hea", no_arg, 'H'},
                                           {"packed-bits", require_arg, 'M'},
                                           {"any_path", require_arg, 'N'},
                                           {"ddl", optional_arg, 'O'},
                                           {"region", no_arg, 'R'},
                                           {"stride", require_arg, 'S'},
-                                          {"strid", require_arg, 'S'},
                                           {"version", no_arg, 'V'},
-                                          {"versio", no_arg, 'V'},
-                                          {"versi", no_arg, 'V'},
-                                          {"vers", no_arg, 'V'},
-                                          {"ver", no_arg, 'V'},
-                                          {"ve", no_arg, 'V'},
                                           {"xml-ns", require_arg, 'X'},
-                                          {"xml-n", require_arg, 'X'},
                                           {"s3-cred", require_arg, '$'},
                                           {"hdfs-attrs", require_arg, '#'},
                                           {"vol-value", require_arg, '1'},
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index 3430c55..ddf129c 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -39,26 +39,9 @@ static int   verbose_g = 0;
  * parameters.
  */
 static const char *           s_opts   = "hVvd:n";
-static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
-                                          {"hel", no_arg, 'h'},
-                                          {"he", no_arg, 'h'},
-                                          {"version", no_arg, 'V'},
-                                          {"version", no_arg, 'V'},
-                                          {"versio", no_arg, 'V'},
-                                          {"versi", no_arg, 'V'},
-                                          {"vers", no_arg, 'V'},
-                                          {"verbose", no_arg, 'v'},
-                                          {"verbos", no_arg, 'v'},
-                                          {"verbo", no_arg, 'v'},
-                                          {"verb", no_arg, 'v'},
-                                          {"dname", require_arg, 'd'},
-                                          {"dnam", require_arg, 'd'},
-                                          {"dna", require_arg, 'd'},
-                                          {"dn", require_arg, 'd'},
-                                          {"noop", no_arg, 'n'},
-                                          {"noo", no_arg, 'n'},
-                                          {"no", no_arg, 'n'},
-                                          {"enable-error-stack", no_arg, 'E'},
+static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},    {"version", no_arg, 'V'},
+                                          {"verbose", no_arg, 'v'}, {"dname", require_arg, 'd'},
+                                          {"noop", no_arg, 'n'},    {"enable-error-stack", no_arg, 'E'},
                                           {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 0a2ea5d..7f3385c 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -34,14 +34,10 @@ char *ub_file     = NULL;
  * parameters. The long-named ones can be partially spelled. When
  * adding more, make sure that they don't clash with each other.
  */
-static const char *           s_opts   = "hi:u:o:c:V"; /* add more later ? */
-static struct h5_long_options l_opts[] = {
-    {"help", no_arg, 'h'},    {"hel", no_arg, 'h'},   {"i", require_arg, 'i'}, /* input file */
-    {"u", require_arg, 'u'},                                                   /* user block file */
-    {"o", require_arg, 'o'},                                                   /* output file */
-    {"clobber", no_arg, 'c'},                                                  /* clobber existing UB */
-    {"clobbe", no_arg, 'c'},  {"clobb", no_arg, 'c'}, {"clob", no_arg, 'c'},
-    {"clo", no_arg, 'c'},     {"cl", no_arg, 'c'},    {NULL, 0, '\0'}};
+static const char *           s_opts   = "hi:u:o:c:V";
+static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},    {"i", require_arg, 'i'},
+                                          {"u", require_arg, 'u'},  {"o", require_arg, 'o'},
+                                          {"clobber", no_arg, 'c'}, {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function:    usage
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index 38d1a5e..fa23b06 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -36,13 +36,9 @@ char *ub_file     = NULL;
  * adding more, make sure that they don't clash with each other.
  */
 static const char *           s_opts   = "hu:i:o:d:V";
-static struct h5_long_options l_opts[] = {
-    {"help", no_arg, 'h'},   {"hel", no_arg, 'h'},  {"i", require_arg, 'i'}, /* input file */
-    {"u", require_arg, 'u'},                                                 /* user block file */
-    {"o", require_arg, 'o'},                                                 /* output file */
-    {"delete", no_arg, 'd'},                                                 /* delete ub */
-    {"delet", no_arg, 'd'},  {"dele", no_arg, 'd'}, {"del", no_arg, 'd'},
-    {"de", no_arg, 'd'},     {NULL, 0, '\0'}};
+static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},   {"i", require_arg, 'i'},
+                                          {"u", require_arg, 'u'}, {"o", require_arg, 'o'},
+                                          {"delete", no_arg, 'd'}, {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function:    usage
diff --git a/tools/src/h5perf/CMakeLists.txt b/tools/src/h5perf/CMakeLists.txt
new file mode 100644
index 0000000..36b0b2f
--- /dev/null
+++ b/tools/src/h5perf/CMakeLists.txt
@@ -0,0 +1,103 @@
+cmake_minimum_required (VERSION 3.12)
+project (HDF5_TOOLS_SRC_H5PERF C)
+
+# --------------------------------------------------------------------
+# Add the executables
+# --------------------------------------------------------------------
+#-- Adding test for h5perf_serial
+set (h5perf_serial_SOURCES
+    ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/sio_perf.c
+    ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/sio_engine.c
+)
+add_executable (h5perf_serial ${h5perf_serial_SOURCES})
+target_include_directories (h5perf_serial PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+if (NOT ONLY_SHARED_LIBS)
+  TARGET_C_PROPERTIES (h5perf_serial STATIC)
+  target_link_libraries (h5perf_serial PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+else ()
+  TARGET_C_PROPERTIES (h5perf_serial SHARED)
+  target_link_libraries (h5perf_serial PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+endif ()
+set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
+set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5perf_serial")
+
+set (H5_DEP_EXECUTABLES h5perf_serial)
+
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_TOOLS_SRC_H5PERF_h5perf_serial_FORMAT h5perf_serial)
+endif ()
+
+if (H5_HAVE_PARALLEL)
+  if (UNIX)
+    #-- Adding test for perf - only on unix systems
+    set (perf_SOURCES
+        ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/perf.c
+    )
+    add_executable (perf ${perf_SOURCES})
+    target_include_directories (perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    if (NOT ONLY_SHARED_LIBS)
+      TARGET_C_PROPERTIES (perf STATIC)
+      target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
+    else ()
+      TARGET_C_PROPERTIES (perf SHARED)
+      target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
+    endif ()
+    set_target_properties (perf PROPERTIES FOLDER perform)
+    set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};perf")
+
+    set (H5_DEP_EXECUTABLES perf)
+
+    #-----------------------------------------------------------------------------
+    # Add Target to clang-format
+    #-----------------------------------------------------------------------------
+    if (HDF5_ENABLE_FORMATTERS)
+      clang_format (HDF5_TOOLS_SRC_H5PERF_perf_FORMAT perf)
+    endif ()
+  endif ()
+
+  #-- Adding test for h5perf
+  set (h5perf_SOURCES
+      ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/pio_perf.c
+      ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/pio_engine.c
+  )
+  add_executable (h5perf ${h5perf_SOURCES})
+  target_include_directories (h5perf PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT ONLY_SHARED_LIBS)
+    TARGET_C_PROPERTIES (h5perf STATIC)
+    target_link_libraries (h5perf PRIVATE ${LINK_LIBS} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}  "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
+  else ()
+    TARGET_C_PROPERTIES (h5perf SHARED)
+    target_link_libraries (h5perf PRIVATE ${LINK_LIBS} ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
+  endif ()
+  set_target_properties (h5perf PROPERTIES FOLDER perform)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5perf")
+
+  set (H5_DEP_EXECUTABLES h5perf)
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_TOOLS_SRC_H5PERF_h5perf_FORMAT h5perf)
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Rules for Installation of tools using make Install target
+#-----------------------------------------------------------------------------
+if (HDF5_EXPORTED_TARGETS)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
+
+  install (
+      TARGETS
+          ${H5_DEP_EXECUTABLES}
+      EXPORT
+          ${HDF5_EXPORTED_TARGETS}
+      RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
+  )
+endif ()
diff --git a/tools/src/h5perf/Makefile.am b/tools/src/h5perf/Makefile.am
new file mode 100644
index 0000000..e8a9fdd
--- /dev/null
+++ b/tools/src/h5perf/Makefile.am
@@ -0,0 +1,63 @@
+#
+# 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 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.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+##
+#
+# HDF5 Library Performance Makefile(.in)
+#
+
+include $(top_srcdir)/config/commence.am
+
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
+
+# bin_PROGRAMS will be installed.
+if BUILD_PARALLEL_CONDITIONAL
+    bin_PROGRAMS=h5perf_serial perf h5perf
+else
+    bin_PROGRAMS=h5perf_serial
+endif
+
+# Add h5perf and h5perf_serial specific linker flags here
+h5perf_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
+h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
+
+# Some programs are not built or run by default, but can be built by hand or by
+# specifying --enable-build-all at configure time.
+# Also, some of these programs should only be built in parallel.
+# Currently there is no such program.
+if BUILD_PARALLEL_CONDITIONAL
+    PARA_BUILD_ALL=
+endif
+if BUILD_ALL_CONDITIONAL
+    BUILD_ALL_PROGS=$(PARA_BUILD_ALL)
+endif
+
+# Define programs that will be run in 'make check'
+# List them in the order they should be run.
+# Parallel test programs.
+if BUILD_PARALLEL_CONDITIONAL
+    TEST_PROG_PARA=h5perf perf
+endif
+
+h5perf_SOURCES=pio_perf.c pio_engine.c
+h5perf_serial_SOURCES=sio_perf.c sio_engine.c
+
+# All of the programs depend on the main hdf5 library, and some of them
+# depend on test or tools library.
+LDADD=$(LIBHDF5)
+h5perf_LDADD=$(LIBH5TOOLS) $(LIBHDF5)
+h5perf_serial_LDADD=$(LIBH5TOOLS) $(LIBHDF5)
+perf_LDADD=$(LIBHDF5)
+
+include $(top_srcdir)/config/conclude.am
diff --git a/tools/test/perform/perf.c b/tools/src/h5perf/perf.c
index 875f932..83d4ab0 100644
--- a/tools/test/perform/perf.c
+++ b/tools/src/h5perf/perf.c
@@ -22,7 +22,6 @@
 
 #include "hdf5.h"
 #include "H5private.h"
-#include "h5test.h"
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -108,6 +107,15 @@ static int parse_args(int argc, char **argv);
 extern char *optarg;
 #endif
 
+#ifndef HDF5_PARAPREFIX
+#define HDF5_PARAPREFIX ""
+#endif
+char *   paraprefix   = NULL;          /* for command line option para-prefix */
+MPI_Info h5_io_info_g = MPI_INFO_NULL; /* MPI INFO object for IO */
+
+static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fullname,
+                             size_t size, hbool_t nest_printf, hbool_t subst_for_superblock);
+
 int
 main(int argc, char **argv)
 {
@@ -206,7 +214,7 @@ main(int argc, char **argv)
         }
     }
 
-    h5_fixname_no_suffix(FILENAME[0], acc_tpl, filename, sizeof filename);
+    h5_fixname_real(FILENAME[0], acc_tpl, NULL, filename, sizeof filename, FALSE, FALSE);
 
     /* create the parallel file */
     fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, acc_tpl);
@@ -451,6 +459,323 @@ parse_args(int argc, char **argv)
 
     return (0);
 }
+/*-------------------------------------------------------------------------
+ * Function:  getenv_all
+ *
+ * Purpose:  Used to get the environment that the root MPI task has.
+ *     name specifies which environment variable to look for
+ *     val is the string to which the value of that environment
+ *     variable will be copied.
+ *
+ *     NOTE: The pointer returned by this function is only
+ *     valid until the next call to getenv_all and the data
+ *     stored there must be copied somewhere else before any
+ *     further calls to getenv_all take place.
+ *
+ * Return:  pointer to a string containing the value of the environment variable
+ *     NULL if the varialbe doesn't exist in task 'root's environment.
+ *
+ * Programmer:  Leon Arber
+ *              4/4/05
+ *
+ * Modifications:
+ *    Use original getenv if MPI is not initialized. This happens
+ *    one uses the PHDF5 library to build a serial nature code.
+ *    Albert 2006/04/07
+ *
+ *-------------------------------------------------------------------------
+ */
+char *
+getenv_all(MPI_Comm comm, int root, const char *name)
+{
+    int          mpi_size, mpi_rank, mpi_initialized, mpi_finalized;
+    int          len;
+    static char *env = NULL;
+
+    HDassert(name);
+
+    MPI_Initialized(&mpi_initialized);
+    MPI_Finalized(&mpi_finalized);
+
+    if (mpi_initialized && !mpi_finalized) {
+        MPI_Comm_rank(comm, &mpi_rank);
+        MPI_Comm_size(comm, &mpi_size);
+        HDassert(root < mpi_size);
+
+        /* The root task does the getenv call
+         * and sends the result to the other tasks */
+        if (mpi_rank == root) {
+            env = HDgetenv(name);
+            if (env) {
+                len = (int)HDstrlen(env);
+                MPI_Bcast(&len, 1, MPI_INT, root, comm);
+                MPI_Bcast(env, len, MPI_CHAR, root, comm);
+            }
+            else {
+                /* len -1 indicates that the variable was not in the environment */
+                len = -1;
+                MPI_Bcast(&len, 1, MPI_INT, root, comm);
+            }
+        }
+        else {
+            MPI_Bcast(&len, 1, MPI_INT, root, comm);
+            if (len >= 0) {
+                if (env == NULL)
+                    env = (char *)HDmalloc((size_t)len + 1);
+                else if (HDstrlen(env) < (size_t)len)
+                    env = (char *)HDrealloc(env, (size_t)len + 1);
+
+                MPI_Bcast(env, len, MPI_CHAR, root, comm);
+                env[len] = '\0';
+            }
+            else {
+                if (env)
+                    HDfree(env);
+                env = NULL;
+            }
+        }
+#ifndef NDEBUG
+        MPI_Barrier(comm);
+#endif
+    }
+    else {
+        /* use original getenv */
+        if (env)
+            HDfree(env);
+        env = HDgetenv(name);
+    } /* end if */
+
+    return env;
+}
+
+/*-------------------------------------------------------------------------
+ * Function:  h5_fixname_real
+ *
+ * Purpose:  Create a file name from a file base name like `test' and
+ *    return it through the FULLNAME (at most SIZE characters
+ *    counting the null terminator). The full name is created by
+ *    prepending the contents of HDF5_PREFIX (separated from the
+ *    base name by a slash) and appending a file extension based on
+ *    the driver supplied, resulting in something like
+ *    `ufs:/u/matzke/test.h5'.
+ *
+ * Return:  Success:  The FULLNAME pointer.
+ *
+ *    Failure:  NULL if BASENAME or FULLNAME is the null
+ *        pointer or if FULLNAME isn't large enough for
+ *        the result.
+ *
+ * Programmer:  Robb Matzke
+ *              Thursday, November 19, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+static char *
+h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fullname, size_t size,
+                hbool_t nest_printf, hbool_t subst_for_superblock)
+{
+    const char *prefix = NULL;
+    const char *env    = NULL; /* HDF5_DRIVER environment variable     */
+    char *      ptr, last = '\0';
+    const char *suffix = _suffix;
+    size_t      i, j;
+    hid_t       driver     = -1;
+    int         isppdriver = 0; /* if the driver is MPI parallel */
+
+    if (!base_name || !fullname || size < 1)
+        return NULL;
+
+    HDmemset(fullname, 0, size);
+
+    /* figure out the suffix */
+    if (H5P_DEFAULT != fapl) {
+        if ((driver = H5Pget_driver(fapl)) < 0)
+            return NULL;
+
+        if (suffix) {
+            if (H5FD_FAMILY == driver) {
+                if (subst_for_superblock)
+                    suffix = "00000.h5";
+                else
+                    suffix = nest_printf ? "%%05d.h5" : "%05d.h5";
+            }
+            else if (H5FD_MULTI == driver) {
+
+                /* Get the environment variable, if it exists, in case
+                 * we are using the split driver since both of those
+                 * use the multi VFD under the hood.
+                 */
+                env = HDgetenv("HDF5_DRIVER");
+#ifdef HDF5_DRIVER
+                /* Use the environment variable, then the compile-time constant */
+                if (!env)
+                    env = HDF5_DRIVER;
+#endif
+                if (env && !HDstrcmp(env, "split")) {
+                    /* split VFD */
+                    if (subst_for_superblock)
+                        suffix = "-m.h5";
+                    else
+                        suffix = NULL;
+                }
+                else {
+                    /* multi VFD */
+                    if (subst_for_superblock)
+                        suffix = "-s.h5";
+                    else
+                        suffix = NULL;
+                }
+            }
+        }
+    }
+
+    /* Must first check fapl is not H5P_DEFAULT (-1) because H5FD_XXX
+     * could be of value -1 if it is not defined.
+     */
+    isppdriver = H5P_DEFAULT != fapl && (H5FD_MPIO == driver);
+
+    /* Check what prefix to use for test files. Process HDF5_PARAPREFIX and
+     * HDF5_PREFIX.
+     * Use different ones depending on parallel or serial driver used.
+     * (The #ifdef is needed to prevent compile failure in case MPI is not
+     * configured.)
+     */
+    if (isppdriver) {
+        /*
+         * For parallel:
+         *      First use command line option, then the environment
+         *      variable, then try the constant
+         */
+        static int explained = 0;
+
+        prefix = (paraprefix ? paraprefix : getenv_all(MPI_COMM_WORLD, 0, "HDF5_PARAPREFIX"));
+
+        if (!prefix && !explained) {
+            /* print hint by process 0 once. */
+            int mpi_rank;
+
+            MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+
+            if (mpi_rank == 0)
+                HDprintf("*** Hint ***\n"
+                         "You can use environment variable HDF5_PARAPREFIX to "
+                         "run parallel test files in a\n"
+                         "different directory or to add file type prefix. e.g.,\n"
+                         "   HDF5_PARAPREFIX=pfs:/PFS/user/me\n"
+                         "   export HDF5_PARAPREFIX\n"
+                         "*** End of Hint ***\n");
+
+            explained = TRUE;
+#ifdef HDF5_PARAPREFIX
+            prefix = HDF5_PARAPREFIX;
+#endif /* HDF5_PARAPREFIX */
+        }
+    }
+    else {
+        /*
+         * For serial:
+         *      First use the environment variable, then try the constant
+         */
+        prefix = HDgetenv("HDF5_PREFIX");
+
+#ifdef HDF5_PREFIX
+        if (!prefix)
+            prefix = HDF5_PREFIX;
+#endif /* HDF5_PREFIX */
+    }
+
+    /* Prepend the prefix value to the base name */
+    if (prefix && *prefix) {
+        if (isppdriver) {
+            /* This is a parallel system */
+            char *subdir;
+
+            if (!HDstrcmp(prefix, HDF5_PARAPREFIX)) {
+                /*
+                 * If the prefix specifies the HDF5_PARAPREFIX directory, then
+                 * default to using the "/tmp/$USER" or "/tmp/$LOGIN"
+                 * directory instead.
+                 */
+                char *user, *login;
+
+                user   = HDgetenv("USER");
+                login  = HDgetenv("LOGIN");
+                subdir = (user ? user : login);
+
+                if (subdir) {
+                    for (i = 0; i < size && prefix[i]; i++)
+                        fullname[i] = prefix[i];
+
+                    fullname[i++] = '/';
+
+                    for (j = 0; i < size && subdir[j]; ++i, ++j)
+                        fullname[i] = subdir[j];
+                }
+            }
+
+            if (!fullname[0]) {
+                /* We didn't append the prefix yet */
+                HDstrncpy(fullname, prefix, size);
+                fullname[size - 1] = '\0';
+            }
+
+            if (HDstrlen(fullname) + HDstrlen(base_name) + 1 < size) {
+                /*
+                 * Append the base_name with a slash first. Multiple
+                 * slashes are handled below.
+                 */
+                h5_stat_t buf;
+
+                if (HDstat(fullname, &buf) < 0)
+                    /* The directory doesn't exist just yet */
+                    if (HDmkdir(fullname, (mode_t)0755) < 0 && errno != EEXIST)
+                        /*
+                         * We couldn't make the "/tmp/${USER,LOGIN}"
+                         * subdirectory.  Default to PREFIX's original
+                         * prefix value.
+                         */
+                        HDstrcpy(fullname, prefix);
+
+                HDstrcat(fullname, "/");
+                HDstrcat(fullname, base_name);
+            }
+            else {
+                /* Buffer is too small */
+                return NULL;
+            }
+        }
+        else {
+            if (HDsnprintf(fullname, size, "%s/%s", prefix, base_name) == (int)size)
+                /* Buffer is too small */
+                return NULL;
+        }
+    }
+    else if (HDstrlen(base_name) >= size) {
+        /* Buffer is too small */
+        return NULL;
+    }
+    else {
+        HDstrcpy(fullname, base_name);
+    }
+
+    /* Append a suffix */
+    if (suffix) {
+        if (HDstrlen(fullname) + HDstrlen(suffix) >= size)
+            return NULL;
+
+        HDstrcat(fullname, suffix);
+    }
+
+    /* Remove any double slashes in the filename */
+    for (ptr = fullname, i = j = 0; ptr && i < size; i++, ptr++) {
+        if (*ptr != '/' || last != '/')
+            fullname[j++] = *ptr;
+
+        last = *ptr;
+    }
+
+    return fullname;
+}
 
 /*
  * Local variables:
diff --git a/tools/test/perform/pio_engine.c b/tools/src/h5perf/pio_engine.c
index cac36d7..cac36d7 100644
--- a/tools/test/perform/pio_engine.c
+++ b/tools/src/h5perf/pio_engine.c
diff --git a/tools/test/perform/pio_perf.c b/tools/src/h5perf/pio_perf.c
index d38c574..41245d9 100644
--- a/tools/test/perform/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -113,6 +113,12 @@ int      pio_debug_level = 0; /* The debug level:
 /* local variables */
 static const char *progname = "h5perf";
 
+#ifndef HDF5_PARAPREFIX
+#define HDF5_PARAPREFIX ""
+#endif
+char *   paraprefix   = NULL;          /* for command line option para-prefix */
+MPI_Info h5_io_info_g = MPI_INFO_NULL; /* MPI INFO object for IO */
+
 /*
  * Command-line options: The user can specify short or long-named
  * parameters. The long-named ones can be partially spelled. When
@@ -124,145 +130,29 @@ static const char *s_opts = "a:A:B:cCd:D:e:F:ghi:Imno:p:P:stT:wx:X:";
 static const char *s_opts = "a:A:bB:cCd:D:e:F:ghi:Imno:p:P:stT:wx:X:";
 #endif /* 1 */
 static struct h5_long_options l_opts[] = {{"align", require_arg, 'a'},
-                                          {"alig", require_arg, 'a'},
-                                          {"ali", require_arg, 'a'},
-                                          {"al", require_arg, 'a'},
                                           {"api", require_arg, 'A'},
-                                          {"ap", require_arg, 'A'},
 #if 0
     /* a sighting of the elusive binary option */
     { "binary", no_arg, 'b' },
-    { "binar", no_arg, 'b' },
-    { "bina", no_arg, 'b' },
-    { "bin", no_arg, 'b' },
-    { "bi", no_arg, 'b' },
 #endif /* 0 */
                                           {"block-size", require_arg, 'B'},
-                                          {"block-siz", require_arg, 'B'},
-                                          {"block-si", require_arg, 'B'},
-                                          {"block-s", require_arg, 'B'},
-                                          {"block-", require_arg, 'B'},
-                                          {"block", require_arg, 'B'},
-                                          {"bloc", require_arg, 'B'},
-                                          {"blo", require_arg, 'B'},
-                                          {"bl", require_arg, 'B'},
                                           {"chunk", no_arg, 'c'},
-                                          {"chun", no_arg, 'c'},
-                                          {"chu", no_arg, 'c'},
-                                          {"ch", no_arg, 'c'},
                                           {"collective", no_arg, 'C'},
-                                          {"collectiv", no_arg, 'C'},
-                                          {"collecti", no_arg, 'C'},
-                                          {"collect", no_arg, 'C'},
-                                          {"collec", no_arg, 'C'},
-                                          {"colle", no_arg, 'C'},
-                                          {"coll", no_arg, 'C'},
-                                          {"col", no_arg, 'C'},
-                                          {"co", no_arg, 'C'},
                                           {"debug", require_arg, 'D'},
-                                          {"debu", require_arg, 'D'},
-                                          {"deb", require_arg, 'D'},
-                                          {"de", require_arg, 'D'},
                                           {"geometry", no_arg, 'g'},
-                                          {"geometr", no_arg, 'g'},
-                                          {"geomet", no_arg, 'g'},
-                                          {"geome", no_arg, 'g'},
-                                          {"geom", no_arg, 'g'},
-                                          {"geo", no_arg, 'g'},
-                                          {"ge", no_arg, 'g'},
                                           {"help", no_arg, 'h'},
-                                          {"hel", no_arg, 'h'},
-                                          {"he", no_arg, 'h'},
                                           {"interleaved", require_arg, 'I'},
-                                          {"interleave", require_arg, 'I'},
-                                          {"interleav", require_arg, 'I'},
-                                          {"interlea", require_arg, 'I'},
-                                          {"interle", require_arg, 'I'},
-                                          {"interl", require_arg, 'I'},
-                                          {"inter", require_arg, 'I'},
-                                          {"inte", require_arg, 'I'},
-                                          {"int", require_arg, 'I'},
-                                          {"in", require_arg, 'I'},
                                           {"max-num-processes", require_arg, 'P'},
-                                          {"max-num-processe", require_arg, 'P'},
-                                          {"max-num-process", require_arg, 'P'},
-                                          {"max-num-proces", require_arg, 'P'},
-                                          {"max-num-proce", require_arg, 'P'},
-                                          {"max-num-proc", require_arg, 'P'},
-                                          {"max-num-pro", require_arg, 'P'},
-                                          {"max-num-pr", require_arg, 'P'},
-                                          {"max-num-p", require_arg, 'P'},
                                           {"min-num-processes", require_arg, 'p'},
-                                          {"min-num-processe", require_arg, 'p'},
-                                          {"min-num-process", require_arg, 'p'},
-                                          {"min-num-proces", require_arg, 'p'},
-                                          {"min-num-proce", require_arg, 'p'},
-                                          {"min-num-proc", require_arg, 'p'},
-                                          {"min-num-pro", require_arg, 'p'},
-                                          {"min-num-pr", require_arg, 'p'},
-                                          {"min-num-p", require_arg, 'p'},
                                           {"max-xfer-size", require_arg, 'X'},
-                                          {"max-xfer-siz", require_arg, 'X'},
-                                          {"max-xfer-si", require_arg, 'X'},
-                                          {"max-xfer-s", require_arg, 'X'},
-                                          {"max-xfer", require_arg, 'X'},
-                                          {"max-xfe", require_arg, 'X'},
-                                          {"max-xf", require_arg, 'X'},
-                                          {"max-x", require_arg, 'X'},
                                           {"min-xfer-size", require_arg, 'x'},
-                                          {"min-xfer-siz", require_arg, 'x'},
-                                          {"min-xfer-si", require_arg, 'x'},
-                                          {"min-xfer-s", require_arg, 'x'},
-                                          {"min-xfer", require_arg, 'x'},
-                                          {"min-xfe", require_arg, 'x'},
-                                          {"min-xf", require_arg, 'x'},
-                                          {"min-x", require_arg, 'x'},
                                           {"num-bytes", require_arg, 'e'},
-                                          {"num-byte", require_arg, 'e'},
-                                          {"num-byt", require_arg, 'e'},
-                                          {"num-by", require_arg, 'e'},
-                                          {"num-b", require_arg, 'e'},
                                           {"num-dsets", require_arg, 'd'},
-                                          {"num-dset", require_arg, 'd'},
-                                          {"num-dse", require_arg, 'd'},
-                                          {"num-ds", require_arg, 'd'},
-                                          {"num-d", require_arg, 'd'},
                                           {"num-files", require_arg, 'F'},
-                                          {"num-file", require_arg, 'F'},
-                                          {"num-fil", require_arg, 'F'},
-                                          {"num-fi", require_arg, 'F'},
-                                          {"num-f", require_arg, 'F'},
                                           {"num-iterations", require_arg, 'i'},
-                                          {"num-iteration", require_arg, 'i'},
-                                          {"num-iteratio", require_arg, 'i'},
-                                          {"num-iterati", require_arg, 'i'},
-                                          {"num-iterat", require_arg, 'i'},
-                                          {"num-itera", require_arg, 'i'},
-                                          {"num-iter", require_arg, 'i'},
-                                          {"num-ite", require_arg, 'i'},
-                                          {"num-it", require_arg, 'i'},
-                                          {"num-i", require_arg, 'i'},
                                           {"output", require_arg, 'o'},
-                                          {"outpu", require_arg, 'o'},
-                                          {"outp", require_arg, 'o'},
-                                          {"out", require_arg, 'o'},
-                                          {"ou", require_arg, 'o'},
                                           {"threshold", require_arg, 'T'},
-                                          {"threshol", require_arg, 'T'},
-                                          {"thresho", require_arg, 'T'},
-                                          {"thresh", require_arg, 'T'},
-                                          {"thres", require_arg, 'T'},
-                                          {"thre", require_arg, 'T'},
-                                          {"thr", require_arg, 'T'},
-                                          {"th", require_arg, 'T'},
                                           {"write-only", require_arg, 'w'},
-                                          {"write-onl", require_arg, 'w'},
-                                          {"write-on", require_arg, 'w'},
-                                          {"write-o", require_arg, 'w'},
-                                          {"write", require_arg, 'w'},
-                                          {"writ", require_arg, 'w'},
-                                          {"wri", require_arg, 'w'},
-                                          {"wr", require_arg, 'w'},
                                           {NULL, 0, '\0'}};
 
 struct options {
@@ -850,6 +740,135 @@ output_all_info(minmax *mm, int count, int indent_level)
 }
 
 /*
+ * Function:    h5_set_info_object
+ * Purpose:     Process environment variables setting to set up MPI Info
+ *              object.
+ * Return:      0 if all is fine; otherwise non-zero.
+ * Programmer:  Albert Cheng, 2002/05/21.
+ * Modifications:
+ *          Bill Wendling, 2002/05/31
+ *          Modified so that the HDF5_MPI_INFO environment variable can
+ *          be a semicolon separated list of "key=value" pairings. Most
+ *          of the code is to remove any whitespaces which might be
+ *          surrounding the "key=value" pairs.
+ */
+int
+h5_set_info_object(void)
+{
+    char *envp; /* environment pointer */
+    int   ret_value = 0;
+
+    /* handle any MPI INFO hints via $HDF5_MPI_INFO */
+    if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) {
+        char *next, *valp;
+
+        valp = envp = next = HDstrdup(envp);
+
+        if (!valp)
+            return 0;
+
+        /* create an INFO object if not created yet */
+        if (h5_io_info_g == MPI_INFO_NULL)
+            MPI_Info_create(&h5_io_info_g);
+
+        do {
+            size_t len;
+            char * key_val, *endp, *namep;
+
+            if (*valp == ';')
+                valp++;
+
+            /* copy key/value pair into temporary buffer */
+            len     = strcspn(valp, ";");
+            next    = &valp[len];
+            key_val = (char *)HDcalloc(1, len + 1);
+
+            /* increment the next pointer past the terminating semicolon */
+            if (*next == ';')
+                ++next;
+
+            namep = HDstrncpy(key_val, valp, len);
+
+            /* pass up any beginning whitespaces */
+            while (*namep && (*namep == ' ' || *namep == '\t'))
+                namep++;
+
+            if (!*namep)
+                continue; /* was all white space, so move to next k/v pair */
+
+            /* eat up any ending white spaces */
+            endp = &namep[HDstrlen(namep) - 1];
+
+            while (endp && (*endp == ' ' || *endp == '\t'))
+                *endp-- = '\0';
+
+            /* find the '=' */
+            valp = HDstrchr(namep, '=');
+
+            if (valp != NULL) { /* it's a valid key/value pairing */
+                char *tmp_val = valp + 1;
+
+                /* change '=' to \0, move valp down one */
+                *valp-- = '\0';
+
+                /* eat up ending whitespace on the "key" part */
+                while (*valp == ' ' || *valp == '\t')
+                    *valp-- = '\0';
+
+                valp = tmp_val;
+
+                /* eat up beginning whitespace on the "value" part */
+                while (*valp == ' ' || *valp == '\t')
+                    *valp++ = '\0';
+
+                /* actually set the darned thing */
+                if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) {
+                    HDprintf("MPI_Info_set failed\n");
+                    ret_value = -1;
+                }
+            }
+
+            valp = next;
+            HDfree(key_val);
+        } while (next && *next);
+
+        HDfree(envp);
+    }
+
+    return ret_value;
+}
+
+/*
+ * Function:    h5_dump_info_object
+ * Purpose:     Display content of an MPI Info object
+ * Return:      void
+ * Programmer:  Albert Cheng 2002/05/21
+ * Modifications:
+ */
+void
+h5_dump_info_object(MPI_Info info)
+{
+    char key[MPI_MAX_INFO_KEY + 1];
+    char value[MPI_MAX_INFO_VAL + 1];
+    int  flag;
+    int  i, nkeys;
+
+    HDprintf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL);
+    if (info == MPI_INFO_NULL) {
+        HDprintf("object is MPI_INFO_NULL\n");
+    }
+    else {
+        MPI_Info_get_nkeys(info, &nkeys);
+        HDprintf("object has %d items\n", nkeys);
+        for (i = 0; i < nkeys; i++) {
+            MPI_Info_get_nthkey(info, i, key);
+            MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag);
+            HDprintf("%s=%s\n", key, value);
+        }
+    }
+}
+
+/*
  * Function:    get_minmax
  * Purpose:     Gather all the min, max and total of val.
  * Return:      Nothing
diff --git a/tools/test/perform/pio_perf.h b/tools/src/h5perf/pio_perf.h
index 24621da..8924c20 100644
--- a/tools/test/perform/pio_perf.h
+++ b/tools/src/h5perf/pio_perf.h
@@ -15,7 +15,7 @@
 
 #ifndef STANDALONE
 #include "io_timer.h"
-#include "h5test.h"
+#include "H5private.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
 #else
@@ -23,6 +23,15 @@
 #include "pio_standalone.h"
 #endif
 
+#ifdef H5_HAVE_PARALLEL
+extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
+#endif
+
+#ifdef H5_HAVE_PARALLEL
+int  h5_set_info_object(void);
+void h5_dump_info_object(MPI_Info info);
+#endif
+
 /* setup the dataset no fill option if this is v1.5 or more */
 #if H5_VERS_MAJOR > 1 || H5_VERS_MINOR > 4
 #define H5_HAVE_NOFILL 1
diff --git a/tools/test/perform/sio_engine.c b/tools/src/h5perf/sio_engine.c
index 1af2318..e69a7cd 100644
--- a/tools/test/perform/sio_engine.c
+++ b/tools/src/h5perf/sio_engine.c
@@ -50,7 +50,7 @@
 /* verify: if val is false (0), print mesg. */
 #define VRFY(val, mesg)                                                                                      \
     do {                                                                                                     \
-        if (!val) {                                                                                          \
+        if (!(val)) {                                                                                        \
             ERRMSG(mesg);                                                                                    \
             GOTOERROR(FAIL);                                                                                 \
         }                                                                                                    \
diff --git a/tools/test/perform/sio_perf.c b/tools/src/h5perf/sio_perf.c
index 51a7825..1b200b0 100644
--- a/tools/test/perform/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -65,7 +65,7 @@
 #define SIO_HDF5  0x4
 
 /* report 0.0 in case t is zero too */
-#define MB_PER_SEC(bytes, t) (H5_DBL_ABS_EQUAL(t, 0.0) ? 0.0 : ((((double)bytes) / (double)ONE_MB) / (t)))
+#define MB_PER_SEC(bytes, t) (H5_DBL_ABS_EQUAL(t, 0.0) ? 0.0 : ((((double)(bytes)) / (double)ONE_MB) / (t)))
 
 #ifndef TRUE
 #define TRUE 1
@@ -99,168 +99,32 @@ static const char *progname = "h5perf_serial";
  */
 static const char *           s_opts   = "a:A:B:c:Cd:D:e:F:ghi:Imno:p:P:r:stT:v:wx:X:";
 static struct h5_long_options l_opts[] = {{"align", require_arg, 'a'},
-                                          {"alig", require_arg, 'a'},
-                                          {"ali", require_arg, 'a'},
-                                          {"al", require_arg, 'a'},
                                           {"api", require_arg, 'A'},
-                                          {"ap", require_arg, 'A'},
 #if 0
     /* a sighting of the elusive binary option */
     { "binary", no_arg, 'b' },
-    { "binar", no_arg, 'b' },
-    { "bina", no_arg, 'b' },
-    { "bin", no_arg, 'b' },
-    { "bi", no_arg, 'b' },
 #endif /* 0 */
                                           {"block-size", require_arg, 'B'},
-                                          {"block-siz", require_arg, 'B'},
-                                          {"block-si", require_arg, 'B'},
-                                          {"block-s", require_arg, 'B'},
-                                          {"block-", require_arg, 'B'},
-                                          {"block", require_arg, 'B'},
-                                          {"bloc", require_arg, 'B'},
-                                          {"blo", require_arg, 'B'},
-                                          {"bl", require_arg, 'B'},
                                           {"chunk", no_arg, 'c'},
-                                          {"chun", no_arg, 'c'},
-                                          {"chu", no_arg, 'c'},
-                                          {"ch", no_arg, 'c'},
                                           {"collective", no_arg, 'C'},
-                                          {"collectiv", no_arg, 'C'},
-                                          {"collecti", no_arg, 'C'},
-                                          {"collect", no_arg, 'C'},
-                                          {"collec", no_arg, 'C'},
-                                          {"colle", no_arg, 'C'},
-                                          {"coll", no_arg, 'C'},
-                                          {"col", no_arg, 'C'},
-                                          {"co", no_arg, 'C'},
                                           {"debug", require_arg, 'D'},
-                                          {"debu", require_arg, 'D'},
-                                          {"deb", require_arg, 'D'},
-                                          {"de", require_arg, 'D'},
                                           {"file-driver", require_arg, 'v'},
-                                          {"file-drive", require_arg, 'v'},
-                                          {"file-driv", require_arg, 'v'},
-                                          {"file-dri", require_arg, 'v'},
-                                          {"file-dr", require_arg, 'v'},
-                                          {"file-d", require_arg, 'v'},
-                                          {"file-", require_arg, 'v'},
-                                          {"file", require_arg, 'v'},
-                                          {"fil", require_arg, 'v'},
-                                          {"fi", require_arg, 'v'},
                                           {"geometry", no_arg, 'g'},
-                                          {"geometr", no_arg, 'g'},
-                                          {"geomet", no_arg, 'g'},
-                                          {"geome", no_arg, 'g'},
-                                          {"geom", no_arg, 'g'},
-                                          {"geo", no_arg, 'g'},
-                                          {"ge", no_arg, 'g'},
                                           {"help", no_arg, 'h'},
-                                          {"hel", no_arg, 'h'},
-                                          {"he", no_arg, 'h'},
                                           {"interleaved", require_arg, 'I'},
-                                          {"interleave", require_arg, 'I'},
-                                          {"interleav", require_arg, 'I'},
-                                          {"interlea", require_arg, 'I'},
-                                          {"interle", require_arg, 'I'},
-                                          {"interl", require_arg, 'I'},
-                                          {"inter", require_arg, 'I'},
-                                          {"inte", require_arg, 'I'},
-                                          {"int", require_arg, 'I'},
-                                          {"in", require_arg, 'I'},
                                           {"max-num-processes", require_arg, 'P'},
-                                          {"max-num-processe", require_arg, 'P'},
-                                          {"max-num-process", require_arg, 'P'},
-                                          {"max-num-proces", require_arg, 'P'},
-                                          {"max-num-proce", require_arg, 'P'},
-                                          {"max-num-proc", require_arg, 'P'},
-                                          {"max-num-pro", require_arg, 'P'},
-                                          {"max-num-pr", require_arg, 'P'},
-                                          {"max-num-p", require_arg, 'P'},
                                           {"min-num-processes", require_arg, 'p'},
-                                          {"min-num-processe", require_arg, 'p'},
-                                          {"min-num-process", require_arg, 'p'},
-                                          {"min-num-proces", require_arg, 'p'},
-                                          {"min-num-proce", require_arg, 'p'},
-                                          {"min-num-proc", require_arg, 'p'},
-                                          {"min-num-pro", require_arg, 'p'},
-                                          {"min-num-pr", require_arg, 'p'},
-                                          {"min-num-p", require_arg, 'p'},
                                           {"max-xfer-size", require_arg, 'X'},
-                                          {"max-xfer-siz", require_arg, 'X'},
-                                          {"max-xfer-si", require_arg, 'X'},
-                                          {"max-xfer-s", require_arg, 'X'},
-                                          {"max-xfer", require_arg, 'X'},
-                                          {"max-xfe", require_arg, 'X'},
-                                          {"max-xf", require_arg, 'X'},
-                                          {"max-x", require_arg, 'X'},
                                           {"min-xfer-size", require_arg, 'x'},
-                                          {"min-xfer-siz", require_arg, 'x'},
-                                          {"min-xfer-si", require_arg, 'x'},
-                                          {"min-xfer-s", require_arg, 'x'},
-                                          {"min-xfer", require_arg, 'x'},
-                                          {"min-xfe", require_arg, 'x'},
-                                          {"min-xf", require_arg, 'x'},
-                                          {"min-x", require_arg, 'x'},
                                           {"num-bytes", require_arg, 'e'},
-                                          {"num-byte", require_arg, 'e'},
-                                          {"num-byt", require_arg, 'e'},
-                                          {"num-by", require_arg, 'e'},
-                                          {"num-b", require_arg, 'e'},
                                           {"num-dsets", require_arg, 'd'},
-                                          {"num-dset", require_arg, 'd'},
-                                          {"num-dse", require_arg, 'd'},
-                                          {"num-ds", require_arg, 'd'},
-                                          {"num-d", require_arg, 'd'},
                                           {"num-files", require_arg, 'F'},
-                                          {"num-file", require_arg, 'F'},
-                                          {"num-fil", require_arg, 'F'},
-                                          {"num-fi", require_arg, 'F'},
-                                          {"num-f", require_arg, 'F'},
                                           {"num-iterations", require_arg, 'i'},
-                                          {"num-iteration", require_arg, 'i'},
-                                          {"num-iteratio", require_arg, 'i'},
-                                          {"num-iterati", require_arg, 'i'},
-                                          {"num-iterat", require_arg, 'i'},
-                                          {"num-itera", require_arg, 'i'},
-                                          {"num-iter", require_arg, 'i'},
-                                          {"num-ite", require_arg, 'i'},
-                                          {"num-it", require_arg, 'i'},
-                                          {"num-i", require_arg, 'i'},
                                           {"order", require_arg, 'r'},
-                                          {"orde", require_arg, 'r'},
-                                          {"ord", require_arg, 'r'},
-                                          {"or", require_arg, 'r'},
                                           {"output", require_arg, 'o'},
-                                          {"outpu", require_arg, 'o'},
-                                          {"outp", require_arg, 'o'},
-                                          {"out", require_arg, 'o'},
-                                          {"ou", require_arg, 'o'},
                                           {"extendable", no_arg, 't'},
-                                          {"extendabl", no_arg, 't'},
-                                          {"extendab", no_arg, 't'},
-                                          {"extenda", no_arg, 't'},
-                                          {"extend", no_arg, 't'},
-                                          {"exten", no_arg, 't'},
-                                          {"exte", no_arg, 't'},
-                                          {"ext", no_arg, 't'},
-                                          {"ex", no_arg, 't'},
                                           {"threshold", require_arg, 'T'},
-                                          {"threshol", require_arg, 'T'},
-                                          {"thresho", require_arg, 'T'},
-                                          {"thresh", require_arg, 'T'},
-                                          {"thres", require_arg, 'T'},
-                                          {"thre", require_arg, 'T'},
-                                          {"thr", require_arg, 'T'},
-                                          {"th", require_arg, 'T'},
                                           {"write-only", require_arg, 'w'},
-                                          {"write-onl", require_arg, 'w'},
-                                          {"write-on", require_arg, 'w'},
-                                          {"write-o", require_arg, 'w'},
-                                          {"write", require_arg, 'w'},
-                                          {"writ", require_arg, 'w'},
-                                          {"wri", require_arg, 'w'},
-                                          {"wr", require_arg, 'w'},
                                           {NULL, 0, '\0'}};
 
 struct options {
diff --git a/tools/test/perform/sio_perf.h b/tools/src/h5perf/sio_perf.h
index 6242782..d998377 100644
--- a/tools/test/perform/sio_perf.h
+++ b/tools/src/h5perf/sio_perf.h
@@ -15,7 +15,7 @@
 
 #ifndef STANDALONE
 #include "io_timer.h"
-#include "h5test.h"
+#include "H5private.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
 #else
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 536de69..934b4d1 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -626,6 +626,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
     hid_t              wtype_id      = H5I_INVALID_HID; /* read/write type ID */
     hid_t              ocpl_id       = H5I_INVALID_HID; /* property to pass copy options */
     hid_t              lcpl_id       = H5I_INVALID_HID; /* link creation property list */
+    hid_t              dxpl_id       = H5I_INVALID_HID; /* dataset transfer property list */
     named_dt_t *       named_dt_head = NULL;            /* Pointer to the stack of named datatypes copied */
     size_t             msize;                           /* size of type */
     hsize_t            nelmts;                          /* number of elements in dataset */
@@ -995,12 +996,27 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                     if (need < H5TOOLS_MALLOCSIZE)
                                         buf = HDmalloc(need);
 
+                                    /* Set up collective write if using filters in parallel */
+                                    {
+#ifdef H5_HAVE_PARALLEL
+                                        hbool_t parallel = (H5FD_MPIO == H5Pget_driver(options->fout_fapl));
+
+                                        if (parallel && apply_s && apply_f) {
+                                            if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+                                                H5TOOLS_GOTO_ERROR((-1), "H5Pcreate failed");
+                                            if (H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE) < 0)
+                                                H5TOOLS_GOTO_ERROR((-1), "H5Pset_dxpl_mpio failed");
+                                        }
+                                        else
+#endif
+                                            dxpl_id = H5P_DEFAULT;
+                                    }
+
                                     if (buf != NULL) {
                                         if (H5Dread(dset_in, wtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) <
                                             0)
                                             H5TOOLS_GOTO_ERROR((-1), "H5Dread failed");
-                                        if (H5Dwrite(dset_out, wtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) <
-                                            0)
+                                        if (H5Dwrite(dset_out, wtype_id, H5S_ALL, H5S_ALL, dxpl_id, buf) < 0)
                                             H5TOOLS_GOTO_ERROR((-1), "H5Dwrite failed");
 
                                         /* Check if we have VL data in the dataset's
@@ -1102,8 +1118,8 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                             if (H5Dread(dset_in, wtype_id, hslab_space, f_space_id,
                                                         H5P_DEFAULT, hslab_buf) < 0)
                                                 H5TOOLS_GOTO_ERROR((-1), "H5Dread failed");
-                                            if (H5Dwrite(dset_out, wtype_id, hslab_space, f_space_id,
-                                                         H5P_DEFAULT, hslab_buf) < 0)
+                                            if (H5Dwrite(dset_out, wtype_id, hslab_space, f_space_id, dxpl_id,
+                                                         hslab_buf) < 0)
                                                 H5TOOLS_GOTO_ERROR((-1), "H5Dwrite failed");
 
                                             /* reclaim any VL memory, if necessary */
@@ -1382,6 +1398,7 @@ done:
         H5Pclose(dcpl_in);
         H5Pclose(gcpl_in);
         H5Pclose(gcpl_out);
+        H5Pclose(dxpl_id);
         H5Sclose(f_space_id);
         H5Dclose(dset_in);
         H5Dclose(dset_out);
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index 3bf641a..efc80b6 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -172,102 +172,19 @@ struct handler_t {
 static const char *s_opts = "Aa:Ddm:EFfhGgl:sSTO:Vw:H:";
 /* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
 static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
-                                          {"hel", no_arg, 'h'},
-                                          {"he", no_arg, 'h'},
                                           {"filemetadata", no_arg, 'F'},
-                                          {"filemetadat", no_arg, 'F'},
-                                          {"filemetada", no_arg, 'F'},
-                                          {"filemetad", no_arg, 'F'},
-                                          {"filemeta", no_arg, 'F'},
-                                          {"filemet", no_arg, 'F'},
-                                          {"fileme", no_arg, 'F'},
-                                          {"filem", no_arg, 'F'},
-                                          {"file", no_arg, 'f'},
-                                          {"fil", no_arg, 'f'},
-                                          {"fi", no_arg, 'f'},
                                           {"groupmetadata", no_arg, 'G'},
-                                          {"groupmetadat", no_arg, 'G'},
-                                          {"groupmetada", no_arg, 'G'},
-                                          {"groupmetad", no_arg, 'G'},
-                                          {"groupmeta", no_arg, 'G'},
-                                          {"groupmet", no_arg, 'G'},
-                                          {"groupme", no_arg, 'G'},
-                                          {"groupm", no_arg, 'G'},
-                                          {"group", no_arg, 'g'},
-                                          {"grou", no_arg, 'g'},
-                                          {"gro", no_arg, 'g'},
-                                          {"gr", no_arg, 'g'},
                                           {"links", require_arg, 'l'},
-                                          {"link", require_arg, 'l'},
-                                          {"lin", require_arg, 'l'},
-                                          {"li", require_arg, 'l'},
                                           {"dsetmetadata", no_arg, 'D'},
-                                          {"dsetmetadat", no_arg, 'D'},
-                                          {"dsetmetada", no_arg, 'D'},
-                                          {"dsetmetad", no_arg, 'D'},
-                                          {"dsetmeta", no_arg, 'D'},
-                                          {"dsetmet", no_arg, 'D'},
-                                          {"dsetme", no_arg, 'D'},
-                                          {"dsetm", no_arg, 'D'},
-                                          {"dset", no_arg, 'd'},
-                                          {"dse", no_arg, 'd'},
-                                          {"ds", no_arg, 'd'},
                                           {"dims", require_arg, 'm'},
-                                          {"dim", require_arg, 'm'},
-                                          {"di", require_arg, 'm'},
                                           {"dtypemetadata", no_arg, 'T'},
-                                          {"dtypemetadat", no_arg, 'T'},
-                                          {"dtypemetada", no_arg, 'T'},
-                                          {"dtypemetad", no_arg, 'T'},
-                                          {"dtypemeta", no_arg, 'T'},
-                                          {"dtypemet", no_arg, 'T'},
-                                          {"dtypeme", no_arg, 'T'},
-                                          {"dtypem", no_arg, 'T'},
-                                          {"dtype", no_arg, 'T'},
-                                          {"dtyp", no_arg, 'T'},
-                                          {"dty", no_arg, 'T'},
-                                          {"dt", no_arg, 'T'},
                                           {"object", require_arg, 'O'},
-                                          {"objec", require_arg, 'O'},
-                                          {"obje", require_arg, 'O'},
-                                          {"obj", require_arg, 'O'},
-                                          {"ob", require_arg, 'O'},
                                           {"version", no_arg, 'V'},
-                                          {"versio", no_arg, 'V'},
-                                          {"versi", no_arg, 'V'},
-                                          {"vers", no_arg, 'V'},
-                                          {"ver", no_arg, 'V'},
-                                          {"ve", no_arg, 'V'},
                                           {"attribute", no_arg, 'A'},
-                                          {"attribut", no_arg, 'A'},
-                                          {"attribu", no_arg, 'A'},
-                                          {"attrib", no_arg, 'A'},
-                                          {"attri", no_arg, 'A'},
-                                          {"attr", no_arg, 'A'},
-                                          {"att", no_arg, 'A'},
-                                          {"at", no_arg, 'A'},
                                           {"enable-error-stack", no_arg, 'E'},
                                           {"numattrs", require_arg, 'a'},
-                                          {"numattr", require_arg, 'a'},
-                                          {"numatt", require_arg, 'a'},
-                                          {"numat", require_arg, 'a'},
-                                          {"numa", require_arg, 'a'},
-                                          {"num", require_arg, 'a'},
-                                          {"nu", require_arg, 'a'},
                                           {"freespace", no_arg, 's'},
-                                          {"freespac", no_arg, 's'},
-                                          {"freespa", no_arg, 's'},
-                                          {"freesp", no_arg, 's'},
-                                          {"frees", no_arg, 's'},
-                                          {"free", no_arg, 's'},
-                                          {"fre", no_arg, 's'},
-                                          {"fr", no_arg, 's'},
                                           {"summary", no_arg, 'S'},
-                                          {"summar", no_arg, 'S'},
-                                          {"summa", no_arg, 'S'},
-                                          {"summ", no_arg, 'S'},
-                                          {"sum", no_arg, 'S'},
-                                          {"su", no_arg, 'S'},
                                           {"s3-cred", require_arg, 'w'},
                                           {"hdfs-attrs", require_arg, 'H'},
                                           {NULL, 0, '\0'}};
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index 524ad03..face2f0 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -32,7 +32,7 @@
 #define H5F_ACS_SKIP_EOF_CHECK_NAME     "skip_eof_check"
 
 /* Default increment is 1 megabytes for the --increment option */
-#define DEFAULT_INCREMENT 1024 * 1024
+#define DEFAULT_INCREMENT (1024 * 1024)
 
 static char *  fname_g            = NULL;
 static hbool_t clear_status_flags = FALSE;
@@ -45,39 +45,10 @@ static hsize_t increment          = DEFAULT_INCREMENT;
  * Command-line options: only publicize long options
  */
 static const char *           s_opts   = "hVsmzi*";
-static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
-                                          {"hel", no_arg, 'h'},
-                                          {"he", no_arg, 'h'},
-                                          {"version", no_arg, 'V'},
-                                          {"version", no_arg, 'V'},
-                                          {"versio", no_arg, 'V'},
-                                          {"versi", no_arg, 'V'},
-                                          {"vers", no_arg, 'V'},
-                                          {"status", no_arg, 's'},
-                                          {"statu", no_arg, 's'},
-                                          {"stat", no_arg, 's'},
-                                          {"sta", no_arg, 's'},
-                                          {"st", no_arg, 's'},
-                                          {"image", no_arg, 'm'},
-                                          {"imag", no_arg, 'm'},
-                                          {"ima", no_arg, 'm'},
-                                          {"im", no_arg, 'm'},
-                                          {"filesize", no_arg, 'z'},
-                                          {"filesiz", no_arg, 'z'},
-                                          {"filesi", no_arg, 'z'},
-                                          {"files", no_arg, 'z'},
-                                          {"file", no_arg, 'z'},
-                                          {"fil", no_arg, 'z'},
-                                          {"fi", no_arg, 'z'},
-                                          {"increment", optional_arg, 'i'},
-                                          {"incremen", optional_arg, 'i'},
-                                          {"increme", optional_arg, 'i'},
-                                          {"increm", optional_arg, 'i'},
-                                          {"incre", optional_arg, 'i'},
-                                          {"incr", optional_arg, 'i'},
-                                          {"inc", optional_arg, 'i'},
-                                          {"in", optional_arg, 'i'},
-                                          {NULL, 0, '\0'}};
+static struct h5_long_options l_opts[] = {
+    {"help", no_arg, 'h'},  {"version", no_arg, 'V'},  {"status", no_arg, 's'},
+    {"image", no_arg, 'm'}, {"filesize", no_arg, 'z'}, {"increment", optional_arg, 'i'},
+    {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function:    usage
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 5ada730..4fcfa26 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -376,40 +376,44 @@
 
   macro (ADD_H5_TEST resultfile resultcode)
     if (HDF5_TEST_SERIAL)
-      # If using memchecker add tests without using scripts
-      if (HDF5_ENABLE_USING_MEMCHECKER)
-        add_test (NAME H5DIFF-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${ARGN})
-        set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-       if (${resultcode})
-          set_tests_properties (H5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
-        endif ()
-        if (last_test)
-          set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
-        endif ()
-      else ()
-        add_test (
-            NAME H5DIFF-${resultfile}
-            COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_file_ext}>"
-                -D "TEST_ARGS:STRING=${ARGN}"
-                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-                -D "TEST_OUTPUT=${resultfile}.out"
-                -D "TEST_EXPECT=${resultcode}"
-                -D "TEST_REFERENCE=${resultfile}.txt"
-                -D "TEST_APPEND=EXIT CODE:"
-                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-        )
-        if (last_test)
-          set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
-        endif ()
-      endif ()
+      ADD_SH5_TEST (${resultfile} ${resultcode} ${ARGN})
     endif ()
     if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL)
       ADD_PH5_TEST (${resultfile} ${resultcode} ${ARGN})
     endif ()
   endmacro ()
 
+  macro (ADD_SH5_TEST resultfile resultcode)
+    # If using memchecker add tests without using scripts
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME H5DIFF-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${ARGN})
+      set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      if (${resultcode})
+        set_tests_properties (H5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
+      endif ()
+      if (last_test)
+        set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
+      endif ()
+    else ()
+      add_test (
+          NAME H5DIFF-${resultfile}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff${tgt_file_ext}>"
+              -D "TEST_ARGS:STRING=${ARGN}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${resultfile}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${resultfile}.txt"
+              -D "TEST_APPEND=EXIT CODE:"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      if (last_test)
+        set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
+      endif ()
+    endif ()
+  endmacro ()
+
   macro (ADD_PH5_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -1549,7 +1553,8 @@ ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array)
 # ##############################################################################
 # # dataset subsets
 # ##############################################################################
-ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;])
+#serial only
+ADD_SH5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;])
 
 # ##############################################################################
 # # VDS tests
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 29922e8..e74054c 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -199,8 +199,8 @@ const H5L_class_t UD_link_class[1] = {{
 
 #define DIM1  20
 #define DIM2  10
-#define CDIM1 DIM1 / 2
-#define CDIM2 DIM2 / 2
+#define CDIM1 (DIM1 / 2)
+#define CDIM2 (DIM2 / 2)
 #define RANK  2
 
 /* Dataspace of 0 dimension size */
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index 1da6b63..5632cc0 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -31,24 +31,7 @@
 #define UBTXT3 "u511.txt"
 #define UBTXT4 "u512.txt"
 #define UBTXT5 "u513.txt"
-/* not used yet
-#define UBTXT6 "u1023.txt"
-#define UBTXT7 "u1024.txt"
-#define UBTXT8 "u1025.txt"
-#define UBTXT9 "u2047.txt"
-#define UBTXT10 "u2048.txt"
-#define UBTXT11 "u2049.txt"
-#define UBBIN1 "u0.dat"
-#define UBBIN2 "u10.dat"
-#define UBBIN3 "u511.dat"
-#define UBBIN4 "u512.dat"
-#define UBBIN5 "u513.dat"
-*/
 
-/* not used yet
-#define FILE1 "tnull.h5"
-#define FILE2 "tnullwithub.h5"
-*/
 /* tall is same as dumper test */
 #define FILE7 "tall.h5"
 #define FILE8 "twithub.h5"
@@ -66,24 +49,13 @@ char pattern[11] = "abcdefghij";
 
 #define BUF_SIZE 1024
 
-/* Element selection information */
-
-typedef enum { RED, GREEN, BLUE, WHITE, BLACK } enumtype;
-
-/* Compound datatype */
-typedef struct s1_t {
-    unsigned int a;
-    unsigned int b;
-    float        c;
-} s1_t;
-
 /* A UD link traversal function.  Shouldn't actually be called. */
 static hid_t
 UD_traverse(const char H5_ATTR_UNUSED *link_name, hid_t H5_ATTR_UNUSED cur_group,
             const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size, hid_t H5_ATTR_UNUSED lapl_id,
             hid_t H5_ATTR_UNUSED dxpl_id)
 {
-    return -1;
+    return H5I_INVALID_HID;
 }
 
 #define MY_LINKCLASS 187
@@ -115,261 +87,340 @@ g1.2.1 : slink
 g2 : dset2.1  dset2.2 udlink
 
 */
-
-static void
+static herr_t
 gent_ub(const char *filename, size_t ub_size, size_t ub_fill)
 {
-    hid_t   fid, group, attr, dataset, space;
-    hid_t   create_plist;
+    hid_t   fid          = H5I_INVALID_HID;
+    hid_t   group        = H5I_INVALID_HID;
+    hid_t   attr         = H5I_INVALID_HID;
+    hid_t   dataset      = H5I_INVALID_HID;
+    hid_t   space        = H5I_INVALID_HID;
+    hid_t   create_plist = H5I_INVALID_HID;
     hsize_t dims[2];
     int     data[2][2], dset1[10][10], dset2[20];
     char    buf[BUF_SIZE];
     int     i, j;
     size_t  u;
     float   dset2_1[10], dset2_2[3][5];
-    int     fd;
-    char *  bp;
+    int     fd = -1;
 
     if (ub_size > 0) {
-        create_plist = H5Pcreate(H5P_FILE_CREATE);
-        H5Pset_userblock(create_plist, (hsize_t)ub_size);
-        fid = H5Fcreate(filename, H5F_ACC_TRUNC, create_plist, H5P_DEFAULT);
+        if ((create_plist = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            goto error;
+        if (H5Pset_userblock(create_plist, (hsize_t)ub_size) < 0)
+            goto error;
+        if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, create_plist, H5P_DEFAULT)) < 0)
+            goto error;
     }
     else {
-        fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto error;
     }
 
-    /* create groups */
-    group = H5Gcreate2(fid, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    H5Gclose(group);
+    /* Create groups */
+    if ((group = H5Gcreate2(fid, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (H5Gclose(group) < 0)
+        goto error;
 
-    group = H5Gcreate2(fid, "/g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    H5Gclose(group);
+    if ((group = H5Gcreate2(fid, "/g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (H5Gclose(group) < 0)
+        goto error;
 
-    group = H5Gcreate2(fid, "/g1/g1.1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    H5Gclose(group);
+    if ((group = H5Gcreate2(fid, "/g1/g1.1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (H5Gclose(group) < 0)
+        goto error;
 
-    group = H5Gcreate2(fid, "/g1/g1.2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    H5Gclose(group);
+    if ((group = H5Gcreate2(fid, "/g1/g1.2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (H5Gclose(group) < 0)
+        goto error;
 
-    group = H5Gcreate2(fid, "/g1/g1.2/g1.2.1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    H5Gclose(group);
+    if ((group = H5Gcreate2(fid, "/g1/g1.2/g1.2.1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (H5Gclose(group) < 0)
+        goto error;
 
-    /* root attributes */
-    group = H5Gopen2(fid, "/", H5P_DEFAULT);
+    /* Root attributes */
+    if ((group = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
+        goto error;
 
     dims[0] = 10;
-    space   = H5Screate_simple(1, dims, NULL);
-    attr    = H5Acreate2(group, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    HDsprintf(buf, "abcdefghi");
-    H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
-    H5Sclose(space);
-    H5Aclose(attr);
-
-    dims[0]    = 2;
-    dims[1]    = 2;
-    space      = H5Screate_simple(2, dims, NULL);
-    attr       = H5Acreate2(group, "attr2", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT);
+    if ((space = H5Screate_simple(1, dims, NULL)) < 0)
+        goto error;
+    if ((attr = H5Acreate2(group, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (HDsprintf(buf, "abcdefghi") < 0)
+        goto error;
+    if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
+    if (H5Aclose(attr) < 0)
+        goto error;
+
+    dims[0] = 2;
+    dims[1] = 2;
+    if ((space = H5Screate_simple(2, dims, NULL)) < 0)
+        goto error;
+    if ((attr = H5Acreate2(group, "attr2", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
     data[0][0] = 0;
     data[0][1] = 1;
     data[1][0] = 2;
     data[1][1] = 3;
-    H5Awrite(attr, H5T_NATIVE_INT, data);
-    H5Sclose(space);
-    H5Aclose(attr);
+    if (H5Awrite(attr, H5T_NATIVE_INT, data) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
+    if (H5Aclose(attr) < 0)
+        goto error;
 
-    H5Gclose(group);
+    if (H5Gclose(group) < 0)
+        goto error;
 
-    group = H5Gopen2(fid, "/g1/g1.1", H5P_DEFAULT);
+    if ((group = H5Gopen2(fid, "/g1/g1.1", H5P_DEFAULT)) < 0)
+        goto error;
 
-    /* dset1.1.1 */
+    /* Dataset 1.1.1 */
     dims[0] = 10;
     dims[1] = 10;
-    space   = H5Screate_simple(2, dims, NULL);
-    dataset = H5Dcreate2(group, "dset1.1.1", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if ((space = H5Screate_simple(2, dims, NULL)) < 0)
+        goto error;
+    if ((dataset =
+             H5Dcreate2(group, "dset1.1.1", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
     for (i = 0; i < 10; i++)
         for (j = 0; j < 10; j++)
             dset1[i][j] = j * i;
-    H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
-    H5Sclose(space);
+    if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
 
-    /* attributes of dset1.1.1 */
+    /* Attributes of dset1.1.1 */
     dims[0] = 27;
-    space   = H5Screate_simple(1, dims, NULL);
-    attr    = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    HDsprintf(buf, "1st attribute of dset1.1.1");
-    H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
-    H5Sclose(space);
-    H5Aclose(attr);
+    if ((space = H5Screate_simple(1, dims, NULL)) < 0)
+        goto error;
+    if ((attr = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (HDsprintf(buf, "1st attribute of dset1.1.1") < 0)
+        goto error;
+    if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
+    if (H5Aclose(attr) < 0)
+        goto error;
 
     dims[0] = 27;
-    space   = H5Screate_simple(1, dims, NULL);
-    attr    = H5Acreate2(dataset, "attr2", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    HDsprintf(buf, "2nd attribute of dset1.1.1");
-    H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
-    H5Sclose(space);
-    H5Aclose(attr);
-
-    H5Dclose(dataset);
-
-    /* dset1.1.2 */
+    if ((space = H5Screate_simple(1, dims, NULL)) < 0)
+        goto error;
+    if ((attr = H5Acreate2(dataset, "attr2", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+    if (HDsprintf(buf, "2nd attribute of dset1.1.1") < 0)
+        goto error;
+    if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
+    if (H5Aclose(attr) < 0)
+        goto error;
+
+    if (H5Dclose(dataset) < 0)
+        goto error;
+
+    /* Dataset 1.1.2 */
     dims[0] = 20;
-    space   = H5Screate_simple(1, dims, NULL);
-    dataset = H5Dcreate2(group, "dset1.1.2", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if ((space = H5Screate_simple(1, dims, NULL)) < 0)
+        goto error;
+    if ((dataset =
+             H5Dcreate2(group, "dset1.1.2", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
     for (i = 0; i < 20; i++)
         dset2[i] = i;
-    H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2);
-    H5Sclose(space);
-    H5Dclose(dataset);
-
-    H5Gclose(group);
-
-    /* external link */
-    H5Lcreate_external("somefile", "somepath", fid, "/g1/g1.2/extlink", H5P_DEFAULT, H5P_DEFAULT);
-
-    /* soft link */
-    group = H5Gopen2(fid, "/g1/g1.2/g1.2.1", H5P_DEFAULT);
-    H5Lcreate_soft("somevalue", group, "slink", H5P_DEFAULT, H5P_DEFAULT);
-    H5Gclose(group);
-
-    group = H5Gopen2(fid, "/g2", H5P_DEFAULT);
-
-    /* dset2.1 */
+    if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
+    if (H5Dclose(dataset) < 0)
+        goto error;
+
+    if (H5Gclose(group) < 0)
+        goto error;
+
+    /* External link */
+    if (H5Lcreate_external("somefile", "somepath", fid, "/g1/g1.2/extlink", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto error;
+
+    /* Soft link */
+    if ((group = H5Gopen2(fid, "/g1/g1.2/g1.2.1", H5P_DEFAULT)) < 0)
+        goto error;
+    if (H5Lcreate_soft("somevalue", group, "slink", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto error;
+    if (H5Gclose(group) < 0)
+        goto error;
+
+    if ((group = H5Gopen2(fid, "/g2", H5P_DEFAULT)) < 0)
+        goto error;
+
+    /* Dataset 2.1 */
     dims[0] = 10;
-    space   = H5Screate_simple(1, dims, NULL);
-    dataset = H5Dcreate2(group, "dset2.1", H5T_IEEE_F32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if ((space = H5Screate_simple(1, dims, NULL)) < 0)
+        goto error;
+    if ((dataset =
+             H5Dcreate2(group, "dset2.1", H5T_IEEE_F32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
     for (i = 0; i < 10; i++)
         dset2_1[i] = (float)((float)i * 0.1F + 1.0F);
-    H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2_1);
-    H5Sclose(space);
-    H5Dclose(dataset);
-
-    /* dset2.2 */
+    if (H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2_1) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
+    if (H5Dclose(dataset) < 0)
+        goto error;
+
+    /* Dataset 2.2 */
     dims[0] = 3;
     dims[1] = 5;
-    space   = H5Screate_simple(2, dims, NULL);
-    dataset = H5Dcreate2(group, "dset2.2", H5T_IEEE_F32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if ((space = H5Screate_simple(2, dims, NULL)) < 0)
+        goto error;
+    if ((dataset =
+             H5Dcreate2(group, "dset2.2", H5T_IEEE_F32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
     for (i = 0; i < 3; i++)
         for (j = 0; j < 5; j++)
             dset2_2[i][j] = (float)(((float)i + 1.0F) * (float)j * 0.1F);
-    H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2_2);
-    H5Sclose(space);
-    H5Dclose(dataset);
-
-    H5Gclose(group);
-
-    /* user-defined link */
-    H5Lregister(UD_link_class);
-    H5Lcreate_ud(fid, "/g2/udlink", (H5L_type_t)MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT);
-
-    H5Fclose(fid);
+    if (H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2_2) < 0)
+        goto error;
+    if (H5Sclose(space) < 0)
+        goto error;
+    if (H5Dclose(dataset) < 0)
+        goto error;
+
+    if (H5Gclose(group) < 0)
+        goto error;
+
+    /* User-defined link */
+    if (H5Lregister(UD_link_class) < 0)
+        goto error;
+    if (H5Lcreate_ud(fid, "/g2/udlink", (H5L_type_t)MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT) <
+        0)
+        goto error;
+
+    /* MUST close the file ID before the user block code or you risk tripping
+     * over file locking issues.
+     */
+    if (H5Fclose(fid) < 0)
+        goto error;
 
     /* If a user block is being used, write to it here */
     if (ub_size > 0) {
-        HDassert(ub_size <= BUF_SIZE);
+        char *bp;
 
-        fd = HDopen(filename, O_RDWR);
-        HDassert(fd >= 0);
+        if (ub_size > BUF_SIZE)
+            goto error;
 
-        /* fill buf with pattern */
+        if ((fd = HDopen(filename, O_RDWR)) < 0)
+            goto error;
+
+        /* Fill buf with pattern */
         HDmemset(buf, '\0', ub_size);
         bp = buf;
         for (u = 0; u < ub_fill; u++)
             *bp++ = pattern[u % 10];
 
-        (void)HDwrite(fd, buf, ub_size);
+        if (HDwrite(fd, buf, ub_size) < 0)
+            goto error;
+
+        if (HDclose(fd) < 0)
+            goto error;
+    }
 
+    return SUCCEED;
+
+error:
+    if (fd >= 0)
         HDclose(fd);
+
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(fid);
+        H5Gclose(group);
+        H5Aclose(attr);
+        H5Dclose(dataset);
+        H5Sclose(space);
+        H5Pclose(create_plist);
     }
+    H5E_END_TRY;
+
+    return FAIL;
 }
 
-static void
+/* Creates a simple (i.e., not HDF5) text file and fills it with a pattern */
+static herr_t
 create_textfile(const char *name, size_t size)
 {
-    char * buf;
-    int    fd;
+    char * buf = NULL;
+    int    fd  = -1;
     size_t i;
-    char * bp;
+    char * bp = NULL;
 
-    fd = HDcreat(name, 0777);
-    HDassert(fd >= 0);
-    buf = (char *)HDcalloc(size, (size_t)1);
-    HDassert(buf);
+    if ((fd = HDcreat(name, 0777)) < 0)
+        goto error;
+    if (NULL == (buf = (char *)HDcalloc(size, 1)))
+        goto error;
 
-    /* fill buf with pattern */
+    /* Fill buf with pattern */
     bp = buf;
     for (i = 0; i < size; i++)
         *bp++ = pattern[i % 10];
 
-    (void)HDwrite(fd, buf, size);
+    if (HDwrite(fd, buf, size) < 0)
+        goto error;
 
     HDfree(buf);
-
     HDclose(fd);
-}
-
-#ifdef notdef
-/* not used yet */
-void
-create_binfile(char *name, off_t size)
-{
-    char *buf;
-    int   fd;
-    int   i;
-    char *bp;
 
-    fd = creat(name, 0777);
-    HDassert(fd >= 0);
+    return SUCCEED;
 
-    buf = HDcalloc(size, 1);
-    HDassert(buf);
-
-    /* fill buf with pattern */
-    bp = buf;
-    for (i = 0; i < size; i++)
-        *bp++ = (char)i & 0xff;
-
-    (void)HDwrite(fd, buf, size);
+error:
+    HDfree(buf);
+    if (fd >= 0)
+        HDclose(fd);
 
-    HDclose(fd);
+    return FAIL;
 }
-#endif
 
 /*-------------------------------------------------------------------------
  * Function: main
  *
  *-------------------------------------------------------------------------
  */
-
 int
 main(void)
 {
-
-    /*
-    create_textfile(UBTXT1, (size_t)0);
-    */
-    create_textfile(UBTXT2, (size_t)10);
-    create_textfile(UBTXT3, (size_t)511);
-    create_textfile(UBTXT4, (size_t)512);
-    create_textfile(UBTXT5, (size_t)513);
-    /*
-    create_textfile(UBTXT6, (size_t)1023);
-    create_textfile(UBTXT7, (size_t)1024);
-    create_textfile(UBTXT8, (size_t)1025);
-    create_textfile(UBTXT9, (size_t)2047);
-    create_textfile(UBTXT10, (size_t)2048);
-    create_textfile(UBTXT11, (size_t)2049);
-
-    create_binfile(UBBIN1, (off_t)0);
-    create_binfile(UBBIN2, (off_t)10);
-    create_binfile(UBBIN3, (off_t)511);
-    create_binfile(UBBIN4, (off_t)512);
-    create_binfile(UBBIN5, (off_t)513);
-
-    */
-    gent_ub(FILE7, (size_t)0, (size_t)0);
-    gent_ub(FILE8, (size_t)512, HDstrlen(pattern));
-    gent_ub(FILE9, (size_t)1024, (size_t)513);
-
-    return 0;
+    if (create_textfile(UBTXT2, 10) < 0)
+        goto error;
+    if (create_textfile(UBTXT3, 511) < 0)
+        goto error;
+    if (create_textfile(UBTXT4, 512) < 0)
+        goto error;
+    if (create_textfile(UBTXT5, 513) < 0)
+        goto error;
+
+    if (gent_ub(FILE7, 0, 0) < 0)
+        goto error;
+    if (gent_ub(FILE8, 512, HDstrlen(pattern)) < 0)
+        goto error;
+    if (gent_ub(FILE9, 1024, 513) < 0)
+        goto error;
+
+    return EXIT_SUCCESS;
+
+error:
+    HDfprintf(stderr, "h5jam test generator FAILED\n");
+    return EXIT_FAILURE;
 }
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index acad74e..b62fa53 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -111,8 +111,8 @@ const char *H5REPACK_FILENAMES[] = {"h5repack_big_out", NULL};
 
 #define DIM1  40
 #define DIM2  20
-#define CDIM1 DIM1 / 2
-#define CDIM2 DIM2 / 2
+#define CDIM1 (DIM1 / 2)
+#define CDIM2 (DIM2 / 2)
 #define RANK  2
 
 /* Size of userblock (for userblock test) */
diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake
index 79de6b9..d4238b5 100644
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@@ -207,7 +207,7 @@
 #   -d --di=15
   ADD_H5_ERR_TEST (h5stat_err1_dims 1 -d --dims=-1 h5stat_threshold.h5)
   ADD_H5_TEST (h5stat_dims1 0 -gd -m 5 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_dims2 0 -d --di=15 h5stat_threshold.h5)
+  ADD_H5_TEST (h5stat_dims2 0 -d --dims=15 h5stat_threshold.h5)
 #
 # Tests for -a option on h5stat_threshold.h5
 #   -a -2 (incorrect threshold value)
diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index a9813e7..c775d6a 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/h5stat/h5stat_gentest.c
@@ -51,7 +51,7 @@
  * Generate HDF5 file with latest format with
  * NUM_GRPS groups and NUM_ATTRS attributes for the dataset
  */
-static void
+static herr_t
 gen_newgrat_file(const char *fname)
 {
     hid_t fcpl    = H5I_INVALID_HID; /* File creation property */
@@ -117,6 +117,21 @@ gen_newgrat_file(const char *fname)
     } /* end for */
 
     /* Close dataset, dataspace, datatype, file */
+    if (H5Pclose(fapl) < 0)
+        goto error;
+    if (H5Pclose(fcpl) < 0)
+        goto error;
+    if (H5Dclose(did) < 0)
+        goto error;
+    if (H5Tclose(tid) < 0)
+        goto error;
+    if (H5Sclose(sid) < 0)
+        goto error;
+    if (H5Fclose(fid) < 0)
+        goto error;
+
+    return SUCCEED;
+
 error:
     H5E_BEGIN_TRY
     {
@@ -130,6 +145,8 @@ error:
         H5Fclose(fid);
     }
     H5E_END_TRY;
+
+    return FAIL;
 } /* gen_newgrat_file() */
 
 /*
@@ -139,7 +156,7 @@ error:
  * datasets. -a N (--numattrs=N): Set the threshold for the # of attributes when printing information for
  * small # of attributes.
  */
-static void
+static herr_t
 gen_threshold_file(const char *fname)
 {
     hid_t    fid         = H5I_INVALID_HID; /* File ID */
@@ -302,6 +319,23 @@ gen_threshold_file(const char *fname)
             goto error;
     }
 
+    if (H5Gclose(gid) < 0)
+        goto error;
+    if (H5Sclose(sid0) < 0)
+        goto error;
+    if (H5Sclose(sid1) < 0)
+        goto error;
+    if (H5Sclose(sid2) < 0)
+        goto error;
+    if (H5Sclose(sid3) < 0)
+        goto error;
+    if (H5Sclose(sid4) < 0)
+        goto error;
+    if (H5Fclose(fid) < 0)
+        goto error;
+
+    return SUCCEED;
+
 error:
     H5E_BEGIN_TRY
     {
@@ -317,6 +351,8 @@ error:
     }
     H5E_END_TRY;
 
+    return FAIL;
+
 } /* gen_threshold_file() */
 
 /*
@@ -327,18 +363,21 @@ error:
  *         one dataset: fixed dimension, chunked layout, w/ filters
  *
  */
-static void
+static herr_t
 gen_idx_file(const char *fname)
 {
-    hid_t   fapl = H5I_INVALID_HID;           /* file access property id */
-    hid_t   fid  = H5I_INVALID_HID;           /* file id */
-    hid_t   sid  = H5I_INVALID_HID;           /* space id */
-    hid_t   dcpl = H5I_INVALID_HID;           /* dataset creation property id */
-    hid_t   did = -1, did2 = H5I_INVALID_HID; /* dataset id */
-    hsize_t dims[1]   = {10};                 /* dataset dimension */
-    hsize_t c_dims[1] = {2};                  /* chunk dimension */
-    int     i;                                /* local index variable */
-    int     buf[10];                          /* data buffer */
+    hid_t fapl = H5I_INVALID_HID; /* file access property id */
+    hid_t fid  = H5I_INVALID_HID; /* file id */
+    hid_t sid  = H5I_INVALID_HID; /* space id */
+    hid_t dcpl = H5I_INVALID_HID; /* dataset creation property id */
+    hid_t did  = H5I_INVALID_HID; /* dataset id */
+#if defined(H5_HAVE_FILTER_DEFLATE)
+    hid_t did2 = H5I_INVALID_HID; /* dataset id (compressed) */
+#endif
+    hsize_t dims[1]   = {10}; /* dataset dimension */
+    hsize_t c_dims[1] = {2};  /* chunk dimension */
+    int     i;                /* local index variable */
+    int     buf[10];          /* data buffer */
 
     /* Get a copy of the file access property */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
@@ -390,6 +429,19 @@ gen_idx_file(const char *fname)
 #endif
 
     /* closing: dataspace, dataset, file */
+    if (H5Pclose(fapl) < 0)
+        goto error;
+    if (H5Pclose(dcpl) < 0)
+        goto error;
+    if (H5Sclose(sid) < 0)
+        goto error;
+    if (H5Dclose(did) < 0)
+        goto error;
+    if (H5Fclose(fid) < 0)
+        goto error;
+
+    return SUCCEED;
+
 error:
     H5E_BEGIN_TRY
     {
@@ -404,6 +456,8 @@ error:
     }
     H5E_END_TRY;
 
+    return FAIL;
+
 } /* gen_idx_file() */
 
 /*
@@ -419,20 +473,21 @@ error:
  *          H5O_refcount_decode in the jira issue.
  *
  */
-static void
+static herr_t
 gen_err_refcount(const char *fname)
 {
-    hid_t          fid  = H5I_INVALID_HID;            /* File identifier */
-    hid_t          sid  = H5I_INVALID_HID;            /* Dataspace message */
-    hid_t          did  = H5I_INVALID_HID;            /* Dataset identifier */
-    hid_t          gid  = H5I_INVALID_HID;            /* Group identifier */
-    hid_t          aid1 = -1, aid2 = H5I_INVALID_HID; /* Attribute identifier */
-    hid_t          tid = H5I_INVALID_HID;             /* Datatype identifier */
-    int            i, n;                              /* Local index variables */
-    int            buf[10];                           /* Data buffer */
-    hsize_t        dims[1];                           /* Dimension size */
-    int            fd  = -1;                          /* File descriptor */
-    unsigned short val = 22;                          /* The refcount message ID */
+    hid_t          fid  = H5I_INVALID_HID; /* File identifier */
+    hid_t          sid  = H5I_INVALID_HID; /* Dataspace message */
+    hid_t          did  = H5I_INVALID_HID; /* Dataset identifier */
+    hid_t          gid  = H5I_INVALID_HID; /* Group identifier */
+    hid_t          aid1 = H5I_INVALID_HID; /* Attribute identifier */
+    hid_t          aid2 = H5I_INVALID_HID; /* Attribute identifier */
+    hid_t          tid  = H5I_INVALID_HID; /* Datatype identifier */
+    int            i, n;                   /* Local index variables */
+    int            buf[10];                /* Data buffer */
+    hsize_t        dims[1];                /* Dimension size */
+    int            fd  = -1;               /* File descriptor */
+    unsigned short val = 22;               /* The refcount message ID */
 
     /* Initialize data buffer */
     n = 0;
@@ -485,6 +540,10 @@ gen_err_refcount(const char *fname)
         goto error;
     if (H5Tclose(tid) < 0)
         goto error;
+
+    /* Be sure to close this before opening the file again via open(), below,
+     * or you'll possibly trip over the file locking.
+     */
     if (H5Fclose(fid) < 0)
         goto error;
 
@@ -495,11 +554,16 @@ gen_err_refcount(const char *fname)
              with the committed datatype */
     /* 24: the offset in the object header containing the version of the
            attribute message */
-    if ((fd = HDopen(fname, O_RDWR, 0633)) >= 0) {
-        HDlseek(fd, 4520 + 24, SEEK_SET);
-        (void)HDwrite(fd, &val, 2);
-        HDclose(fd);
-    }
+    if ((fd = HDopen(fname, O_RDWR, 0633)) < 0)
+        goto error;
+    if (HDlseek(fd, 4520 + 24, SEEK_SET) < 0)
+        goto error;
+    if (HDwrite(fd, &val, 2) < 0)
+        goto error;
+    if (HDclose(fd) < 0)
+        goto error;
+
+    return SUCCEED;
 
 error:
     H5E_BEGIN_TRY
@@ -513,6 +577,11 @@ error:
         H5Fclose(fid);
     }
     H5E_END_TRY;
+
+    if (fd >= 0)
+        HDclose(fd);
+
+    return FAIL;
 } /* gen_err_refcount() */
 
 /*
@@ -542,14 +611,22 @@ error:
 int
 main(void)
 {
-    gen_newgrat_file(NEWGRAT_FILE);
-    gen_threshold_file(THRESHOLD_FILE);
+    if (gen_newgrat_file(NEWGRAT_FILE) < 0)
+        goto error;
+    if (gen_threshold_file(THRESHOLD_FILE) < 0)
+        goto error;
 
     /* Generate an HDF file to test for datasets with Fixed Array indexing */
-    gen_idx_file(IDX_FILE);
+    if (gen_idx_file(IDX_FILE) < 0)
+        goto error;
 
     /* Generate a file with a refcount message ID */
-    gen_err_refcount(ERR_REFCOUNT_FILE);
+    if (gen_err_refcount(ERR_REFCOUNT_FILE) < 0)
+        goto error;
+
+    return EXIT_SUCCESS;
 
-    return 0;
+error:
+    HDfprintf(stderr, "h5stat test generator FAILED\n");
+    return EXIT_FAILURE;
 }
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index 470c381..647f06a 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -304,7 +304,7 @@ TOOLTEST h5stat_links5.ddl -g -l 40000 h5stat_newgrat.h5
 #     -d --di=15
 TOOLTEST h5stat_err1_dims.ddl -d --dims=-1 h5stat_threshold.h5
 TOOLTEST h5stat_dims1.ddl -gd -m 5 h5stat_threshold.h5
-TOOLTEST h5stat_dims2.ddl -d --di=15 h5stat_threshold.h5
+TOOLTEST h5stat_dims2.ddl -d --dims=15 h5stat_threshold.h5
 #
 # Tests for -a option on h5stat_threshold.h5
 #     -a -2 (incorrect threshold value)
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake
index ec24a61..198a363 100644
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@@ -397,7 +397,7 @@
 #
 # The following are tests to verify the expected exit code from h5clear:
 # "h5clear -m h5clear_mdc_image.h5"     (valid option, existing file, succeed exit code)
-# "h5clear --vers"                      (valid option, version #, succeed exit code)
+# "h5clear --version"                   (valid option, version #, succeed exit code)
 # "h5clear -k"                          (invalid 1 option, no file, fail exit code)
 # "h5clear -k junk.h5"                  (invalid 1 option, nonexisting file, fail exit code)
 # "h5clear -l h5clear_sec2_v2.h5"       (invalid 1 option, existing file, fail exit code)
@@ -408,7 +408,7 @@
 # "h5clear -m -l h5clear_sec2_v0.h5"    (valid/invalid 2 options, existing file, fail exit code)
 # "h5clear -l -m h5clear_sec2_v0.h5"    (invalid/valid 2 options, existing file, fail exit code)
   ADD_H5_RETTEST (h5clr_mdc_image "false" "-m" h5clear_mdc_image.h5)
-  ADD_H5_RETTEST (h5clr_vers "false" "--vers")
+  ADD_H5_RETTEST (h5clr_vers "false" "--version")
   ADD_H5_RETTEST (h5clr_k "true" "-k")
   ADD_H5_RETTEST (h5clr_k_junk "true" "-k" junk.h5)
   ADD_H5_RETTEST (h5clr_l_sec2 "true" "-l" h5clear_sec2_v2.h5)
diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in
index c05e43d..a01fa4a 100644
--- a/tools/test/misc/testh5clear.sh.in
+++ b/tools/test/misc/testh5clear.sh.in
@@ -315,7 +315,7 @@ TOOLTEST_ERR orig_h5clear_sec2_v0.h5 -s -m "" h5clear_no_mdc_image.err
 #
 # The following are tests to verify the expected exit code from h5clear:
 # "h5clear -m h5clear_mdc_image.h5"     (valid option, existing file, succeed exit code)
-# "h5clear --vers"                      (valid option, version #, succeed exit code)
+# "h5clear --version"                   (valid option, version #, succeed exit code)
 # "h5clear -k"                          (invalid 1 option, no file, fail exit code)
 # "h5clear -k junk.h5"                  (invalid 1 option, nonexisting file, fail exit code)
 # "h5clear -l h5clear_sec2_v2.h5"       (invalid 1 option, existing file, fail exit code)
@@ -326,7 +326,7 @@ TOOLTEST_ERR orig_h5clear_sec2_v0.h5 -s -m "" h5clear_no_mdc_image.err
 # "h5clear -m -l h5clear_sec2_v0.h5"    (valid/invalid 2 options, existing file, fail exit code)
 # "h5clear -l -m h5clear_sec2_v0.h5"    (invalid/valid 2 options, existing file, fail exit code)
 TOOLTEST h5clear_mdc_image.h5 -m "" $SUCCEED
-TOOLTEST "" --vers "" $SUCCEED
+TOOLTEST "" --version "" $SUCCEED
 TOOLTEST "" -k "" $FAIL
 TOOLTEST junk.h5 -k "" $FAIL
 TOOLTEST h5clear_sec2_v2.h5 -l "" $FAIL
diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt
index 7399723..7bf79c5 100644
--- a/tools/test/perform/CMakeLists.txt
+++ b/tools/test/perform/CMakeLists.txt
@@ -4,39 +4,17 @@ project (HDF5_TOOLS_TEST_PERFORM C)
 # --------------------------------------------------------------------
 # Add the executables
 # --------------------------------------------------------------------
-#-- Adding test for h5perf_serial
-set (h5perf_serial_SOURCES
-    ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_perf.c
-    ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_engine.c
-)
-add_executable (h5perf_serial ${h5perf_serial_SOURCES})
-target_include_directories (h5perf_serial PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-if (NOT BUILD_SHARED_LIBS)
-  TARGET_C_PROPERTIES (h5perf_serial STATIC)
-  target_link_libraries (h5perf_serial PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-else ()
-  TARGET_C_PROPERTIES (h5perf_serial SHARED)
-  target_link_libraries (h5perf_serial PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-endif ()
-set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
-
-#-----------------------------------------------------------------------------
-# Add Target to clang-format
-#-----------------------------------------------------------------------------
-if (HDF5_ENABLE_FORMATTERS)
-  clang_format (HDF5_TOOLS_TEST_PERFORM_h5perf_serial_FORMAT h5perf_serial)
-endif ()
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
   #-- Adding test for h5perf_serial_alone - io_timer.c includes
   set (h5perf_serial_alone_SOURCES
       ${HDF5_TOOLS_DIR}/lib/io_timer.c
-      ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_perf.c
-      ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_engine.c
+      ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/sio_perf.c
+      ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/sio_engine.c
       ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_standalone.c
   )
   add_executable (h5perf_serial_alone ${h5perf_serial_alone_SOURCES})
-  target_include_directories (h5perf_serial_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_TOOLS_DIR}/lib;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5perf_serial_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_TOOLS_DIR}/lib;${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR};${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   if (NOT BUILD_SHARED_LIBS)
     TARGET_C_PROPERTIES (h5perf_serial_alone STATIC)
     target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
@@ -188,63 +166,16 @@ if (HDF5_ENABLE_FORMATTERS)
 endif ()
 
 if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL)
-  if (UNIX)
-    #-- Adding test for perf - only on unix systems
-    set (perf_SOURCES
-        ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/perf.c
-    )
-    add_executable (perf ${perf_SOURCES})
-    target_include_directories (perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-    if (NOT BUILD_SHARED_LIBS)
-      TARGET_C_PROPERTIES (perf STATIC)
-      target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
-    else ()
-      TARGET_C_PROPERTIES (perf SHARED)
-      target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-    endif ()
-    set_target_properties (perf PROPERTIES FOLDER perform)
-
-    #-----------------------------------------------------------------------------
-    # Add Target to clang-format
-    #-----------------------------------------------------------------------------
-    if (HDF5_ENABLE_FORMATTERS)
-      clang_format (HDF5_TOOLS_TEST_PERFORM_perf_FORMAT perf)
-    endif ()
-  endif ()
-
-  #-- Adding test for h5perf
-  set (h5perf_SOURCES
-      ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_perf.c
-      ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_engine.c
-  )
-  add_executable (h5perf ${h5perf_SOURCES})
-  target_include_directories (h5perf PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  if (NOT BUILD_SHARED_LIBS)
-    TARGET_C_PROPERTIES (h5perf STATIC)
-    target_link_libraries (h5perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
-  else ()
-    TARGET_C_PROPERTIES (h5perf SHARED)
-    target_link_libraries (h5perf PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
-  endif ()
-  set_target_properties (h5perf PROPERTIES FOLDER perform)
-
-  #-----------------------------------------------------------------------------
-  # Add Target to clang-format
-  #-----------------------------------------------------------------------------
-  if (HDF5_ENABLE_FORMATTERS)
-    clang_format (HDF5_TOOLS_TEST_PERFORM_h5perf_FORMAT h5perf)
-  endif ()
-
   if (HDF5_BUILD_PERFORM_STANDALONE)
     #-- Adding test for h5perf
     set (h5perf_alone_SOURCES
         ${HDF5_TOOLS_DIR}/lib/io_timer.c
-        ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_perf.c
-        ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_engine.c
+        ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/pio_perf.c
+        ${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR}/pio_engine.c
         ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/pio_standalone.c
     )
     add_executable (h5perf_alone ${h5perf_alone_SOURCES})
-    target_include_directories (h5perf_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_TOOLS_DIR}/lib;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    target_include_directories (h5perf_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_TOOLS_DIR}/lib;${HDF5_TOOLS_SRC_H5PERF_SOURCE_DIR};${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
     if (NOT BUILD_SHARED_LIBS)
       TARGET_C_PROPERTIES (h5perf_alone STATIC)
       target_link_libraries (h5perf_alone PRIVATE ${HDF5_LIB_TARGET} ${LINK_LIBS} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
diff --git a/tools/test/perform/Makefile.am b/tools/test/perform/Makefile.am
index 244ef3a..10b13fe 100644
--- a/tools/test/perform/Makefile.am
+++ b/tools/test/perform/Makefile.am
@@ -21,17 +21,6 @@ include $(top_srcdir)/config/commence.am
 
 AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
 
-# bin_PROGRAMS will be installed.
-if BUILD_PARALLEL_CONDITIONAL
-    bin_PROGRAMS=h5perf_serial h5perf
-else
-    bin_PROGRAMS=h5perf_serial
-endif
-
-# Add h5perf and h5perf_serial specific linker flags here
-h5perf_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
-h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
-
 # Some programs are not built or run by default, but can be built by hand or by
 # specifying --enable-build-all at configure time.
 # Also, some of these programs should only be built in parallel.
@@ -47,18 +36,15 @@ endif
 # List them in the order they should be run.
 # Parallel test programs.
 if BUILD_PARALLEL_CONDITIONAL
-    TEST_PROG_PARA=h5perf perf
+    TEST_PROG_PARA=
 endif
 # Serial test programs.
-TEST_PROG = iopipe chunk chunk_cache overhead zip_perf perf_meta h5perf_serial $(BUILD_ALL_PROGS)
+TEST_PROG = iopipe chunk chunk_cache overhead zip_perf perf_meta $(BUILD_ALL_PROGS)
 
 # check_PROGRAMS will be built but not installed.  Do not any executable
 # that is in bin_PROGRAMS already. Otherwise, it will be removed twice in
 # "make clean" and some systems, e.g., AIX, do not like it.
-check_PROGRAMS= iopipe chunk chunk_cache overhead zip_perf perf_meta $(BUILD_ALL_PROGS) perf
-
-h5perf_SOURCES=pio_perf.c pio_engine.c
-h5perf_serial_SOURCES=sio_perf.c sio_engine.c
+check_PROGRAMS= $(TEST_PROG) $(BUILD_ALL_PROGS)
 
 # These are the files that `make clean' (and derivatives) will remove from
 # this directory.
@@ -67,9 +53,6 @@ CLEANFILES=*.h5 *.raw *.dat x-gnuplot perftest.out
 # All of the programs depend on the main hdf5 library, and some of them
 # depend on test or tools library.
 LDADD=$(LIBHDF5)
-h5perf_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
-h5perf_serial_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
-perf_LDADD=$(LIBH5TEST) $(LIBHDF5)
 iopipe_LDADD=$(LIBH5TEST) $(LIBHDF5)
 zip_perf_LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
 perf_meta_LDADD=$(LIBH5TEST) $(LIBHDF5)
diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c
index 25fa34c..b515961 100644
--- a/tools/test/perform/chunk_cache.c
+++ b/tools/test/perform/chunk_cache.c
@@ -26,9 +26,9 @@
 #define RANK 2
 
 #define DSET1_NAME  "partial_chunks"
-#define DSET1_DIM1  9 * 1000
+#define DSET1_DIM1  (9 * 1000)
 #define DSET1_DIM2  9
-#define CHUNK1_DIM1 2 * 1000
+#define CHUNK1_DIM1 (2 * 1000)
 #define CHUNK1_DIM2 2
 
 #define DSET2_NAME  "hash_value"
@@ -38,7 +38,7 @@
 #define CHUNK2_DIM2 100
 
 #define RDCC_NSLOTS 5
-#define RDCC_NBYTES 1024 * 1024 * 10
+#define RDCC_NBYTES (1024 * 1024 * 10)
 #define RDCC_W0     0.75F
 
 #define FILTER_COUNTER 306
diff --git a/tools/test/perform/pio_standalone.c b/tools/test/perform/pio_standalone.c
index db8633e..032bfba 100644
--- a/tools/test/perform/pio_standalone.c
+++ b/tools/test/perform/pio_standalone.c
@@ -17,20 +17,11 @@
 
 #include "pio_perf.h"
 
-#ifdef STANDALONE
-MPI_Info h5_io_info_g = MPI_INFO_NULL; /* MPI INFO object for IO */
-#endif
-
 /** From h5tools_utils.c **/
 
 /* global variables */
 int nCols = 80;
 
-/* ``get_option'' variables */
-int         H5_opterr = 1; /*get_option prints errors if this is on */
-int         H5_optind = 1; /*token pointer                          */
-const char *H5_optarg;     /*flag argument (or value)               */
-
 int
 get_option(int argc, const char **argv, const char *opts, const struct h5_long_options *l_opts)
 {
@@ -161,134 +152,3 @@ print_version(const char *progname)
     printf("%s: Version %u.%u.%u%s%s\n", progname, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE,
            H5_VERS_SUBRELEASE[0] ? "-" : "", H5_VERS_SUBRELEASE);
 }
-
-#ifdef STANDALONE
-/*
- * Function:    h5_set_info_object
- * Purpose:     Process environment variables setting to set up MPI Info
- *              object.
- * Return:      0 if all is fine; otherwise non-zero.
- * Programmer:  Albert Cheng, 2002/05/21.
- * Modifications:
- *          Bill Wendling, 2002/05/31
- *          Modified so that the HDF5_MPI_INFO environment variable can
- *          be a semicolon separated list of "key=value" pairings. Most
- *          of the code is to remove any whitespaces which might be
- *          surrounding the "key=value" pairs.
- */
-int
-h5_set_info_object(void)
-{
-    char *envp; /* environment pointer */
-    int   ret_value = 0;
-
-    /* handle any MPI INFO hints via $HDF5_MPI_INFO */
-    if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) {
-        char *next, *valp;
-
-        valp = envp = next = HDstrdup(envp);
-
-        if (!valp)
-            return 0;
-
-        /* create an INFO object if not created yet */
-        if (h5_io_info_g == MPI_INFO_NULL)
-            MPI_Info_create(&h5_io_info_g);
-
-        do {
-            size_t len;
-            char * key_val, *endp, *namep;
-
-            if (*valp == ';')
-                valp++;
-
-            /* copy key/value pair into temporary buffer */
-            len     = strcspn(valp, ";");
-            next    = &valp[len];
-            key_val = (char *)HDcalloc(1, len + 1);
-
-            /* increment the next pointer past the terminating semicolon */
-            if (*next == ';')
-                ++next;
-
-            namep = HDstrncpy(key_val, valp, len);
-
-            /* pass up any beginning whitespaces */
-            while (*namep && (*namep == ' ' || *namep == '\t'))
-                namep++;
-
-            if (!*namep)
-                continue; /* was all white space, so move to next k/v pair */
-
-            /* eat up any ending white spaces */
-            endp = &namep[HDstrlen(namep) - 1];
-
-            while (endp && (*endp == ' ' || *endp == '\t'))
-                *endp-- = '\0';
-
-            /* find the '=' */
-            valp = HDstrchr(namep, '=');
-
-            if (valp != NULL) { /* it's a valid key/value pairing */
-                char *tmp_val = valp + 1;
-
-                /* change '=' to \0, move valp down one */
-                *valp-- = '\0';
-
-                /* eat up ending whitespace on the "key" part */
-                while (*valp == ' ' || *valp == '\t')
-                    *valp-- = '\0';
-
-                valp = tmp_val;
-
-                /* eat up beginning whitespace on the "value" part */
-                while (*valp == ' ' || *valp == '\t')
-                    *valp++ = '\0';
-
-                /* actually set the darned thing */
-                if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) {
-                    HDprintf("MPI_Info_set failed\n");
-                    ret_value = -1;
-                }
-            }
-
-            valp = next;
-            HDfree(key_val);
-        } while (next && *next);
-
-        HDfree(envp);
-    }
-
-    return ret_value;
-}
-
-/*
- * Function:    h5_dump_info_object
- * Purpose:     Display content of an MPI Info object
- * Return:      void
- * Programmer:  Albert Cheng 2002/05/21
- * Modifications:
- */
-void
-h5_dump_info_object(MPI_Info info)
-{
-    char key[MPI_MAX_INFO_KEY + 1];
-    char value[MPI_MAX_INFO_VAL + 1];
-    int  flag;
-    int  i, nkeys;
-
-    HDprintf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL);
-    if (info == MPI_INFO_NULL) {
-        HDprintf("object is MPI_INFO_NULL\n");
-    }
-    else {
-        MPI_Info_get_nkeys(info, &nkeys);
-        HDprintf("object has %d items\n", nkeys);
-        for (i = 0; i < nkeys; i++) {
-            MPI_Info_get_nthkey(info, i, key);
-            MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag);
-            HDprintf("%s=%s\n", key, value);
-        }
-    }
-}
-#endif /* STANDALONE */
diff --git a/tools/test/perform/pio_standalone.h b/tools/test/perform/pio_standalone.h
index 4b5c7b2..f1fb946 100644
--- a/tools/test/perform/pio_standalone.h
+++ b/tools/test/perform/pio_standalone.h
@@ -441,22 +441,11 @@ extern char *         strdup(const char *s);
 #define TRUE true
 #endif
 
-/** From h5test.h **/
-
-#ifdef H5_HAVE_PARALLEL
-extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
-#endif
-
-#ifdef H5_HAVE_PARALLEL
-int  h5_set_info_object(void);
-void h5_dump_info_object(MPI_Info info);
-#endif
-
 /** From h5tools_utils.h **/
 
-extern int         H5_opterr; /* getoption prints errors if this is on    */
-extern int         H5_optind; /* token pointer                            */
-extern const char *H5_optarg; /* flag argument (or value)                 */
+H5_DLLVAR int         H5_opterr; /* getoption prints errors if this is on    */
+H5_DLLVAR int         H5_optind; /* token pointer                            */
+H5_DLLVAR const char *H5_optarg; /* flag argument (or value)                 */
 
 enum h5_arg_level {
     no_arg = 0,  /* doesn't take an argument     */
diff --git a/tools/test/perform/sio_standalone.c b/tools/test/perform/sio_standalone.c
index 2e793fb..7c22b53 100644
--- a/tools/test/perform/sio_standalone.c
+++ b/tools/test/perform/sio_standalone.c
@@ -22,11 +22,6 @@
 /* global variables */
 int nCols = 80;
 
-/* ``get_option'' variables */
-int         H5_opterr = 1; /*get_option prints errors if this is on */
-int         H5_optind = 1; /*token pointer                          */
-const char *H5_optarg;     /*flag argument (or value)               */
-
 int
 get_option(int argc, const char **argv, const char *opts, const struct h5_long_options *l_opts)
 {
diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h
index 098b98a..99cca75 100644
--- a/tools/test/perform/sio_standalone.h
+++ b/tools/test/perform/sio_standalone.h
@@ -456,22 +456,11 @@ extern char *         strdup(const char *s);
 #define TRUE true
 #endif
 
-/** From h5test.h **/
-
-#ifdef H5_HAVE_PARALLEL
-extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
-#endif
-
-#ifdef H5_HAVE_PARALLEL
-int  h5_set_info_object(void);
-void h5_dump_info_object(MPI_Info info);
-#endif
-
 /** From h5tools_utils.h **/
 
-extern int         H5_opterr; /* getoption prints errors if this is on    */
-extern int         H5_optind; /* token pointer                            */
-extern const char *H5_optarg; /* flag argument (or value)                 */
+H5_DLLVAR int         H5_opterr; /* getoption prints errors if this is on    */
+H5_DLLVAR int         H5_optind; /* token pointer                            */
+H5_DLLVAR const char *H5_optarg; /* flag argument (or value)                 */
 
 enum h5_arg_level {
     no_arg = 0,  /* doesn't take an argument     */
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 6231587..d8cd3a1 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -35,7 +35,7 @@
 #define MICROSECOND 1000000.0
 
 /* report 0.0 in case t is zero too */
-#define MB_PER_SEC(bytes, t) ((fabs(t) < 0.0000000001) ? 0.0 : ((((double)bytes) / (double)ONE_MB) / (t)))
+#define MB_PER_SEC(bytes, t) ((fabs(t) < 0.0000000001) ? 0.0 : ((((double)(bytes)) / (double)ONE_MB) / (t)))
 
 #ifndef TRUE
 #define TRUE 1
@@ -67,62 +67,11 @@ static void compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, u
 static const char *           s_opts   = "hB:b:c:p:rs:0123456789";
 static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
                                           {"compressability", require_arg, 'c'},
-                                          {"compressabilit", require_arg, 'c'},
-                                          {"compressabili", require_arg, 'c'},
-                                          {"compressabil", require_arg, 'c'},
-                                          {"compressabi", require_arg, 'c'},
-                                          {"compressab", require_arg, 'c'},
-                                          {"compressa", require_arg, 'c'},
-                                          {"compress", require_arg, 'c'},
-                                          {"compres", require_arg, 'c'},
-                                          {"compre", require_arg, 'c'},
-                                          {"compr", require_arg, 'c'},
-                                          {"comp", require_arg, 'c'},
-                                          {"com", require_arg, 'c'},
-                                          {"co", require_arg, 'c'},
                                           {"file-size", require_arg, 's'},
-                                          {"file-siz", require_arg, 's'},
-                                          {"file-si", require_arg, 's'},
-                                          {"file-s", require_arg, 's'},
-                                          {"file", require_arg, 's'},
-                                          {"fil", require_arg, 's'},
-                                          {"fi", require_arg, 's'},
                                           {"max-buffer-size", require_arg, 'B'},
-                                          {"max-buffer-siz", require_arg, 'B'},
-                                          {"max-buffer-si", require_arg, 'B'},
-                                          {"max-buffer-s", require_arg, 'B'},
-                                          {"max-buffer", require_arg, 'B'},
-                                          {"max-buffe", require_arg, 'B'},
-                                          {"max-buff", require_arg, 'B'},
-                                          {"max-buf", require_arg, 'B'},
-                                          {"max-bu", require_arg, 'B'},
-                                          {"max-b", require_arg, 'B'},
-                                          {"max", require_arg, 'B'},
                                           {"min-buffer-size", require_arg, 'b'},
-                                          {"min-buffer-siz", require_arg, 'b'},
-                                          {"min-buffer-si", require_arg, 'b'},
-                                          {"min-buffer-s", require_arg, 'b'},
-                                          {"min-buffer", require_arg, 'b'},
-                                          {"min-buffe", require_arg, 'b'},
-                                          {"min-buff", require_arg, 'b'},
-                                          {"min-buf", require_arg, 'b'},
-                                          {"min-bu", require_arg, 'b'},
-                                          {"min-b", require_arg, 'b'},
-                                          {"min", require_arg, 'b'},
                                           {"prefix", require_arg, 'p'},
-                                          {"prefi", require_arg, 'p'},
-                                          {"pref", require_arg, 'p'},
-                                          {"pre", require_arg, 'p'},
-                                          {"pr", require_arg, 'p'},
                                           {"random-test", no_arg, 'r'},
-                                          {"random-tes", no_arg, 'r'},
-                                          {"random-te", no_arg, 'r'},
-                                          {"random-t", no_arg, 'r'},
-                                          {"random", no_arg, 'r'},
-                                          {"rando", no_arg, 'r'},
-                                          {"rand", no_arg, 'r'},
-                                          {"ran", no_arg, 'r'},
-                                          {"ra", no_arg, 'r'},
                                           {NULL, 0, '\0'}};
 
 /*