diff --git a/.cirrus.yml b/.cirrus.yml
index 1323ce8e95..b96146f230 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -10,7 +10,7 @@ btest_jobs: &BTEST_JOBS 4
 btest_retries: &BTEST_RETRIES 2
 memory: &MEMORY 16GB
 
-config: &CONFIG --build-type=release --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror
+config: &CONFIG --build-type=release --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
 no_spicy_config: &NO_SPICY_CONFIG --build-type=release --disable-broker-tests --disable-spicy --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror
 static_config: &STATIC_CONFIG --build-type=release --disable-broker-tests --enable-static-broker --enable-static-binpac --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror
 binary_config: &BINARY_CONFIG --prefix=$CIRRUS_WORKING_DIR/install --libdir=$CIRRUS_WORKING_DIR/install/lib --binary-package --enable-static-broker --enable-static-binpac --disable-broker-tests --build-type=Release --ccache --enable-werror
diff --git a/CHANGES b/CHANGES
index c8cb84c31f..4e49de6673 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+7.1.0-dev.10 | 2024-07-12 16:02:22 -0700
+
+  * CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure (Tim Wojtulewicz, Corelight)
+
+  * Fix a broken merge (Tim Wojtulewicz, Corelight)
+
+    I merged an old version of the branch on accident and then merged the right
+    one over top of it, but git ended up including both versions. This fixes
+    that mistake.
+
 7.1.0-dev.6 | 2024-07-12 09:51:39 -0700
 
   * Do not emit hook files for builtin modules (Benjamin Bannier, Corelight)
diff --git a/VERSION b/VERSION
index 44d35682ff..329cd89d1e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1.0-dev.6
+7.1.0-dev.10
diff --git a/auxil/broker b/auxil/broker
index fada26ae50..4d19d25dc9 160000
--- a/auxil/broker
+++ b/auxil/broker
@@ -1 +1 @@
-Subproject commit fada26ae504981f7f5524bf2a5c82ae49acd556d
+Subproject commit 4d19d25dc9b3d6b89ea16ae14e1100f10d156551
diff --git a/cmake b/cmake
index 690483f76c..2d42baf8e6 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 690483f76c149ffa8e035b612b406b0964f9886f
+Subproject commit 2d42baf8e63a7494224aa9d02afa2cb43ddb96b8