diff --git a/.github/workflows/nvhpc-cmake.yml b/.github/workflows/nvhpc-cmake.yml
index aeb2c6e7075..0f6f8cdfba6 100644
--- a/.github/workflows/nvhpc-cmake.yml
+++ b/.github/workflows/nvhpc-cmake.yml
@@ -49,6 +49,7 @@ jobs:
           echo "LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/${{ env.NVERDOT }}/cuda/${{ env.CUDAVERDOT }}/lib64:/opt/nvidia/hpc_sdk/Linux_x86_64/${{ env.NVERDOT }}/compilers/lib" >> $GITHUB_ENV
           echo "DESTDIR=/tmp" >> $GITHUB_ENV
 
+# disable subfiling_vfd until MPI_Init_thread error on a NULL communicator with nvhpc is fixed. 
       - name: CMake Configure
         shell: bash
         run: |
@@ -58,6 +59,7 @@ jobs:
           cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
           -DHDF5_ENABLE_PARALLEL:BOOL=ON \
+          -DHDF5_ENABLE_SUBFILING_VFD=OFF \
           -DMPIEXEC_NUMPROC_FLAG:STRING=-np \
           -DMPIEXEC_MAX_NUMPROCS:STRING=2 \
           -DHDF5_BUILD_CPP_LIB:BOOL=OFF \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1316613b67..069884f0825 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,7 @@ else()
     set (HDF5_EXTERNALLY_CONFIGURED 1)
   endif()
 endif()
+include (CMakeDependentOption)
 #-----------------------------------------------------------------------------
 # Instructions for use : Sub-Project Build
 #
@@ -835,32 +836,18 @@ set (HDF5_SRC_INCLUDE_DIRS
     ${HDF5_SRC_INCLUDE_DIRS}
     ${H5FD_SUBFILING_DIR}
 )
-option (HDF5_ENABLE_SUBFILING_VFD "Build Parallel HDF5 Subfiling VFD" OFF)
+cmake_dependent_option(HDF5_ENABLE_SUBFILING_VFD "Build Parallel HDF5 Subfiling VFD" ON "HDF5_ENABLE_PARALLEL;NOT WIN32" OFF)
 if (HDF5_ENABLE_SUBFILING_VFD)
-  if (WIN32)
-    message (FATAL_ERROR " **** Subfiling is not supported on Windows **** ")
-  endif ()
-  if (NOT HDF5_ENABLE_PARALLEL)
-    message (FATAL_ERROR "Subfiling VFD requires a parallel HDF5 build")
-  else ()
-    # Make sure we found MPI_Comm_split_type previously
-    if (NOT H5_HAVE_MPI_Comm_split_type)
-      message (FATAL_ERROR "Subfiling VFD requires MPI-3 support for MPI_Comm_split_type")
-    endif ()
+  if (NOT H5_HAVE_MPI_Comm_split_type)
+    message (FATAL_ERROR "Subfiling VFD requires MPI-3 support for MPI_Comm_split_type")
   endif ()
-
   # Subfiling requires thread operations
   if (NOT Threads_FOUND)
     message (FATAL_ERROR "Subfiling requires thread operations support")
   endif ()
-
   set (H5_HAVE_SUBFILING_VFD 1)
   # IOC VFD is currently only built when subfiling is enabled
   set (H5_HAVE_IOC_VFD 1)
-
-  if(NOT H5_HAVE_SUBFILING_VFD EQUAL 1)
-    set (HDF5_ENABLE_SUBFILING_VFD OFF CACHE BOOL "Build Parallel HDF5 Subfiling VFD" FORCE)
-  endif()
 endif()
 
 message (VERBOSE "LINK_LIBS=${LINK_LIBS}")
diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in
index 31d1aa640d8..12327c978a3 100644
--- a/doxygen/Doxyfile.in
+++ b/doxygen/Doxyfile.in
@@ -496,7 +496,7 @@ SORT_MEMBER_DOCS       = YES
 # this will also influence the order of the classes in the class list.
 # The default value is: NO.
 
-SORT_BRIEF_DOCS        = NO
+SORT_BRIEF_DOCS        = YES
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then Doxygen will sort the
 # (brief and detailed) documentation of class members so that constructors and