diff --git a/.github/workflows/cyg-ninja.yml b/.github/workflows/cyg-ninja.yml
index 9ddafabf656..1136717d44a 100644
--- a/.github/workflows/cyg-ninja.yml
+++ b/.github/workflows/cyg-ninja.yml
@@ -22,7 +22,7 @@ jobs:
           cd build
           cmake -G Ninja \
            -D SITE:STRING=cwin \
-           -DBUILDNAME:STRING="ninja.-sh.ompi" \
+           -DBUILDNAME:STRING="ninja" \
            -D BUILD_SHARED_LIBS:BOOL=OFF \
            -D CTEST_DROP_SITE_INIT:STRING="my.cdash.org" \
            ..
diff --git a/.github/workflows/mac-auto-mpich.yml b/.github/workflows/mac-auto-mpich.yml
index 0f81897641a..96828d1abb8 100644
--- a/.github/workflows/mac-auto-mpich.yml
+++ b/.github/workflows/mac-auto-mpich.yml
@@ -1,9 +1,7 @@
 name: mac auto mpich
 
-on:
-  push:
-    branches: [ develop ]
-  workflow_dispatch:    
+on: [push, pull_request]
+
 jobs:
   build:
     runs-on: macos-latest
@@ -14,7 +12,7 @@ jobs:
       uses: actions/checkout@v4.1.1
     - name: Build and test
       env:
-        NPROCS: 2
+        NPROCS: 3
       run: |
         export HDF5_Make_Ignore=yes
         set
@@ -22,5 +20,3 @@ jobs:
         ./configure --enable-parallel CC=mpicc
         make
         make check
-
-    
diff --git a/.github/workflows/mac-ninja-clang-h-f-j-mpich.yml b/.github/workflows/mac-ninja-clang-h-f-j-mpich.yml
index fa828c6dfbc..e5ef8a370e9 100644
--- a/.github/workflows/mac-ninja-clang-h-f-j-mpich.yml
+++ b/.github/workflows/mac-ninja-clang-h-f-j-mpich.yml
@@ -1,10 +1,7 @@
 name: mac ninja clang h f j mpich
 
-on:
-  workflow_dispatch:
-  push:
-    branches: [ develop ]
-    
+on: [push, pull_request]
+
 jobs:
   build:
     strategy:
@@ -25,20 +22,17 @@ jobs:
             generator: "-G Ninja"
 
     name: ${{ matrix.name }}
-    # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
     if: "!contains(github.event.head_commit.message, 'skip-ci')"
-          
-    # Steps represent a sequence of tasks that will be executed as part of the job
+
     steps:
     - name: Install Dependencies (macOS)
       run: brew install ninja mpich libaec
       if: matrix.os == 'macos-latest'
-      
+
     - name: Install gfortran
       uses: awvwgk/setup-fortran@v1
-    
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+
     - name: Get Sources
       uses: actions/checkout@v4.1.1
 
@@ -48,13 +42,13 @@ jobs:
         export FC="$(which gfortran)"
         mkdir "${{ runner.workspace }}/build"
         cd "${{ runner.workspace }}/build"
-        cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} -DHDF5_BUILD_HL_LIB:BOOL=${{ matrix.hl }} -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} -DMPIEXEC_MAX_NUMPROCS:STRING=2 -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF $GITHUB_WORKSPACE
+        cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} -DHDF5_BUILD_HL_LIB:BOOL=${{ matrix.hl }} -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} -DMPIEXEC_MAX_NUMPROCS:STRING=3 -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF $GITHUB_WORKSPACE
       shell: bash
 
     - name: Build
       if: matrix.generator != 'autogen'
       run: cmake --build . --config ${{ matrix.build_type }}
-      working-directory: ${{ runner.workspace }}/build      
+      working-directory: ${{ runner.workspace }}/build
 
     - name: Test
       if: matrix.generator != 'autogen'
diff --git a/.github/workflows/mac13-clang15-r-f-mpich-sf.yml b/.github/workflows/mac13-clang15-r-f-mpich-sf.yml
index a469c0296af..d309ee165da 100644
--- a/.github/workflows/mac13-clang15-r-f-mpich-sf.yml
+++ b/.github/workflows/mac13-clang15-r-f-mpich-sf.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches: [ develop ]
-  pull_request:  
+  pull_request:
     branches:
       - develop
     paths-ignore:
@@ -14,7 +14,7 @@ on:
       - 'release_docs/**'
       - 'ACKNOWLEDGEMENTS'
       - 'COPYING**'
-      - '**.md'      
+      - '**.md'
 jobs:
   build:
     strategy:
@@ -69,7 +69,7 @@ jobs:
         -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} \
         -DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
         -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
-        -DMPIEXEC_MAX_NUMPROCS:STRING=2 \
+        -DMPIEXEC_MAX_NUMPROCS:STRING=3 \
         $GITHUB_WORKSPACE
 
     - name: Build
diff --git a/.github/workflows/mac13-ninja-clang15-d-h-f-mpich-sf.yml b/.github/workflows/mac13-ninja-clang15-d-h-f-mpich-sf.yml
index aa63eb3aa67..b43886700ee 100644
--- a/.github/workflows/mac13-ninja-clang15-d-h-f-mpich-sf.yml
+++ b/.github/workflows/mac13-ninja-clang15-d-h-f-mpich-sf.yml
@@ -59,7 +59,7 @@ jobs:
         -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} \
         -DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
         -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
-        -DMPIEXEC_MAX_NUMPROCS:STRING=2 \
+        -DMPIEXEC_MAX_NUMPROCS:STRING=3 \
         $GITHUB_WORKSPACE
       shell: bash
 
diff --git a/.github/workflows/mac13-xcode-clang15-d-mpich-s3-sf.yml b/.github/workflows/mac13-xcode-clang15-d-mpich-s3-sf.yml
index 1cc2825c5df..1e0e961f58b 100644
--- a/.github/workflows/mac13-xcode-clang15-d-mpich-s3-sf.yml
+++ b/.github/workflows/mac13-xcode-clang15-d-mpich-s3-sf.yml
@@ -28,8 +28,8 @@ jobs:
             -DHDF5_ENABLE_ROS3_VFD:BOOL=ON \
             -DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
             -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
+            -DMPIEXEC_MAX_NUMPROCS:STRING=3 \
             -G Xcode ..
           cmake --build . --config Debug
           ctest --build . -C Debug -E MPI_TEST_H5DIFF-h5diff -VV --output-on-error
           sudo cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_CONFIG_NAME=Debug  -P cmake_install.cmake
-
diff --git a/.github/workflows/mac14-ninja-clang19-fl-d-f-mpich-sf.yml b/.github/workflows/mac14-ninja-clang19-fl-d-f-mpich-sf.yml
index fbb9b9cb5ed..c34330a99dd 100644
--- a/.github/workflows/mac14-ninja-clang19-fl-d-f-mpich-sf.yml
+++ b/.github/workflows/mac14-ninja-clang19-fl-d-f-mpich-sf.yml
@@ -1,9 +1,6 @@
 name: mac14 ninja clang19 fl d f mpich sf
 
-on:
-  workflow_dispatch:
-  push:
-    branches: [ develop ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -90,7 +87,7 @@ jobs:
         -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
         -DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
         -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
-        -DMPIEXEC_MAX_NUMPROCS:STRING=2 \
+        -DMPIEXEC_MAX_NUMPROCS:STRING=3 \
         ..
         ninja
         ninja test
diff --git a/WATCHME.md b/WATCHME.md
index d34592a10d7..0bb1c6739c0 100644
--- a/WATCHME.md
+++ b/WATCHME.md
@@ -25,7 +25,9 @@
 
 | Test    | Status |
 | --------| ------ |
-| macOS | [![mac14 auto o4](https://github.com/hyoklee/hdf5/actions/workflows/mac14-auto-o4.yml/badge.svg)](https://github.com/hyoklee/hdf5/actions/workflows/mac14-auto-o4.yml) [![mac14 ninja h j ompi cd](https://github.com/hyoklee/hdf5/actions/workflows/mac14-ninja-h-j-ompi-cd.yml/badge.svg)](https://github.com/hyoklee/hdf5/actions/workflows/mac14-ninja-h-j-ompi-cd.yml) |
+| mac12 |  [![mac Xcode](https://github.com/hyoklee/hdf5/actions/workflows/mac-xcode.yml/badge.svg)](https://github.com/hyoklee/hdf5/actions/workflows/mac-xcode.yml) |
+| mac13 | [![mac13 off](https://github.com/hyoklee/hdf5/actions/workflows/mac13-off.yml/badge.svg)](https://github.com/hyoklee/hdf5/actions/workflows/mac13-off.yml) |
+| mac14 | [![mac14 auto o4](https://github.com/hyoklee/hdf5/actions/workflows/mac14-auto-o4.yml/badge.svg)](https://github.com/hyoklee/hdf5/actions/workflows/mac14-auto-o4.yml) [![mac14 ninja h j ompi cd](https://github.com/hyoklee/hdf5/actions/workflows/mac14-ninja-h-j-ompi-cd.yml/badge.svg)](https://github.com/hyoklee/hdf5/actions/workflows/mac14-ninja-h-j-ompi-cd.yml) |
 | iOS |  [![mac13 ios](https://github.com/hyoklee/hdf5/actions/workflows/ios.yml/badge.svg)](https://github.com/hyoklee/hdf5/actions/workflows/ios.yml) |
 
 ### Linux