diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ea0edd9a8..1281b7eee4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 jobs:
   build_and_test:
     macos:
-      xcode: 15.4.0
+      xcode: 16.0
     steps:
       - checkout
       - run:
@@ -9,10 +9,10 @@ jobs:
           command: git submodule update --init --recursive --depth 1
       - run:
           name: Build Loop
-          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' build | xcpretty
+          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'name=iPhone 16' build | xcpretty
       - run:
           name: Run Tests
-          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' test | xcpretty
+          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'name=iPhone 16' test | xcpretty
 workflows:
   version: 2
   build_and_test:
diff --git a/AmplitudeService b/AmplitudeService
index 98f9759b17..a8b67c8797 160000
--- a/AmplitudeService
+++ b/AmplitudeService
@@ -1 +1 @@
-Subproject commit 98f9759b17e8716c65257c24a652564ead3c5183
+Subproject commit a8b67c8797d8249051b88023dd7a7040a5e93aab
diff --git a/CGMBLEKit b/CGMBLEKit
index 4adef26620..5f1991f260 160000
--- a/CGMBLEKit
+++ b/CGMBLEKit
@@ -1 +1 @@
-Subproject commit 4adef2662060f7d11d1abd8d099c3e022bf00cef
+Subproject commit 5f1991f260808e87dd180d0af38f67c54a0d1dfc
diff --git a/G7SensorKit b/G7SensorKit
index 46047ed13c..87c599c945 160000
--- a/G7SensorKit
+++ b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 46047ed13c44d21bf75c7ca99642f954a35ed6c7
+Subproject commit 87c599c94594d7271637c44f4749b790159ad145
diff --git a/LibreTransmitter b/LibreTransmitter
index 044cf70bd7..0a3481f4de 160000
--- a/LibreTransmitter
+++ b/LibreTransmitter
@@ -1 +1 @@
-Subproject commit 044cf70bd79813d47048291b740a599e1ab4ab40
+Subproject commit 0a3481f4decfd651ba24990aa52f3888f09b6dcd
diff --git a/LogglyService b/LogglyService
index 1bb8223748..a655c1cdfc 160000
--- a/LogglyService
+++ b/LogglyService
@@ -1 +1 @@
-Subproject commit 1bb8223748003e51770875200489cce83f74c570
+Subproject commit a655c1cdfc747097b9b1106f1f83d25cc65a9e77
diff --git a/Loop b/Loop
index e45f1376bc..1b341c8035 160000
--- a/Loop
+++ b/Loop
@@ -1 +1 @@
-Subproject commit e45f1376bc8cdf5f8ed009f0f165455909e60155
+Subproject commit 1b341c8035649dcdd5f7dfda1386faabf784043f
diff --git a/LoopKit b/LoopKit
index a03be5768e..02b54a960b 160000
--- a/LoopKit
+++ b/LoopKit
@@ -1 +1 @@
-Subproject commit a03be5768e8d9cec87d93f0af9e72c97b7200b9a
+Subproject commit 02b54a960be5cbfd63f48cfaeb9a0a46788897dd
diff --git a/LoopOnboarding b/LoopOnboarding
index 4c5c192799..6abfc4c7c9 160000
--- a/LoopOnboarding
+++ b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit 4c5c1927999ae5dd3861e67ca9f10c14a59d1cc6
+Subproject commit 6abfc4c7c911d2575aaf74bc3c2ec4394b5e1d06
diff --git a/LoopSupport b/LoopSupport
index 4728c67836..7bfdeda786 160000
--- a/LoopSupport
+++ b/LoopSupport
@@ -1 +1 @@
-Subproject commit 4728c67836e6a60118fcf6cc262010e9b3d14e68
+Subproject commit 7bfdeda786adc5c985dbc3ae061ebd8b245916be
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 20f167d456..08c84be7c5 100644
--- a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "f8d1e9c237647ab612da7f2bd3ae26946f39410508314c00cf54509a673f147e",
+  "originHash" : "fd72e13865455a2feb38fe4cd881140a6934ac07e655a5d873c322bc9fac19f7",
   "pins" : [
     {
       "identity" : "amplitude-ios",
@@ -37,6 +37,15 @@
         "version" : "1.7.1"
       }
     },
+    {
+      "identity" : "loopalgorithm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/LoopKit/LoopAlgorithm",
+      "state" : {
+        "branch" : "main",
+        "revision" : "9d2405464d16a3bd2953e114f046b20bf2cabb48"
+      }
+    },
     {
       "identity" : "mixpanel-swift",
       "kind" : "remoteSourceControl",
@@ -96,7 +105,7 @@
       "location" : "https://github.com/tidepool-org/TidepoolKit",
       "state" : {
         "branch" : "dev",
-        "revision" : "54045c2e7d720dcd8a0909037772dcd6f54f0158"
+        "revision" : "b21a7906a202525c4e303dbee9b92182927ef0b5"
       }
     },
     {
@@ -104,7 +113,6 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/LoopKit/ZIPFoundation.git",
       "state" : {
-        "branch" : "stream-entry",
         "revision" : "c67b7509ec82ee2b4b0ab3f97742b94ed9692494"
       }
     }
diff --git a/MinimedKit b/MinimedKit
index a079b53119..1c0b30187a 160000
--- a/MinimedKit
+++ b/MinimedKit
@@ -1 +1 @@
-Subproject commit a079b53119594b37436043859f0fe0a0754724e2
+Subproject commit 1c0b30187a067b2c53629084ec8d5215d802570b
diff --git a/MixpanelService b/MixpanelService
index b33debdac3..23cae11cc5 160000
--- a/MixpanelService
+++ b/MixpanelService
@@ -1 +1 @@
-Subproject commit b33debdac37d6ef3be955eebb0c42495a1f19232
+Subproject commit 23cae11cc542625148abda93c6e37d250fe7191e
diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM
index 3b220185d0..6e014e1737 160000
--- a/NightscoutRemoteCGM
+++ b/NightscoutRemoteCGM
@@ -1 +1 @@
-Subproject commit 3b220185d0bea9f5f49c2d8d99db95cfe4c636c0
+Subproject commit 6e014e1737ba6ff48d468d9a07f33526a91b3399
diff --git a/NightscoutService b/NightscoutService
index d839b66054..4ec123b865 160000
--- a/NightscoutService
+++ b/NightscoutService
@@ -1 +1 @@
-Subproject commit d839b66054623c213ba79c57540f00e08fad81c3
+Subproject commit 4ec123b865ac785b8bc451631fc52728b57f699c
diff --git a/OmniBLE b/OmniBLE
index 6f65cbae4c..d7f05cd400 160000
--- a/OmniBLE
+++ b/OmniBLE
@@ -1 +1 @@
-Subproject commit 6f65cbae4c8089a892911e273204edfc4cc81e9d
+Subproject commit d7f05cd4004edfd86b375800e596bb79695f4e03
diff --git a/OmniKit b/OmniKit
index 92948a7684..0ebb478e93 160000
--- a/OmniKit
+++ b/OmniKit
@@ -1 +1 @@
-Subproject commit 92948a7684ec382714becc53c643a1617597bb37
+Subproject commit 0ebb478e93f17b1704e7ffd6a5d70adcdbdde38e
diff --git a/Scripts/sync.swift b/Scripts/sync.swift
index 2553551e0b..f71ca45041 100755
--- a/Scripts/sync.swift
+++ b/Scripts/sync.swift
@@ -112,6 +112,7 @@ for project in projects {
     try await repository.checkout(revspec: syncBranch)
 
     // Merge changes from tidepool to diy
+    print("Starting merge for \(project.project)")
     try await repository.merge(revisionSpecification: "\(incomingRemote)/\(project.branch)", signature: signature)
 
     let originTree = try repository.lookupTree(for: "origin/\(project.branch)")
diff --git a/TidepoolService b/TidepoolService
index 6e007cbde9..2cd32ca193 160000
--- a/TidepoolService
+++ b/TidepoolService
@@ -1 +1 @@
-Subproject commit 6e007cbde9920a9d8f25ae855deb36f989a2ce0f
+Subproject commit 2cd32ca193eedd4fb4ed769679f36f1a01126669
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
index 21d8657d72..e012b3403c 160000
--- a/dexcom-share-client-swift
+++ b/dexcom-share-client-swift
@@ -1 +1 @@
-Subproject commit 21d8657d727f26df76342188e580022bf4884714
+Subproject commit e012b3403cfd8a8f8b7bbb2ff063e9f870c9c8bc