diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 344736312..4577dc680 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
       - "**"
 env:
   CI_XCODE_15: /Applications/Xcode_15.4.0.app/Contents/Developer
-  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
+  CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
 jobs:
   test-xcode:
     env:
@@ -31,45 +31,45 @@ jobs:
             developerDir: CI_XCODE_15
           - name: Xcode 16
             script: build:starters
-            iosVersion: '18.1'
+            iosVersion: '18.5'
             iosDeviceModel: iPhone 16
-            watchOsVersion: '11.1'
+            watchOsVersion: '11.5'
             watchDeviceModel: Apple Watch Series 10 (46mm)
-            tvOsVersion: '18.1'
+            tvOsVersion: '18.5'
             tvDeviceModel: Apple TV
-            macosVersion: 14
+            macosVersion: 15
             developerDir: CI_XCODE_16
           # Core Module
           - name: Core Module, iOS 17
             script: test:ios
             iosVersion: '17.5'
             iosDeviceModel: iPhone 15
-            macosVersion: 15
-            developerDir: CI_XCODE_16
+            macosVersion: 14
+            developerDir: CI_XCODE_15
           - name: Core Module, iOS 18
             script: test:ios
-            iosVersion: '18.1'
+            iosVersion: '18.5'
             iosDeviceModel: iPhone 16
             macosVersion: 15
             developerDir: CI_XCODE_16
           - name: Core Module, macOS 14
             script: test:macos
             macosVersion: 14
-            developerDir: CI_XCODE_16
-          - name: Core Module, macOS 15
-            script: test:macos
-            macosVersion: 15
-            developerDir: CI_XCODE_16
+            developerDir: CI_XCODE_15
+          # - name: Core Module, macOS 15
+          #   script: test:macos
+          #   macosVersion: 15
+          #   developerDir: CI_XCODE_16
           # LiveQuery Module
           - name: LiveQuery Module, iOS 17
             script: test:parse_live_query:ios
             iosVersion: '17.5'
             iosDeviceModel: iPhone 15
-            macosVersion: 15
-            developerDir: CI_XCODE_16
+            macosVersion: 14
+            developerDir: CI_XCODE_15
           - name: LiveQuery Module, iOS 18
             script: test:parse_live_query:ios
-            iosVersion: '18.1'
+            iosVersion: '18.5'
             iosDeviceModel: iPhone 16
             macosVersion: 15
             developerDir: CI_XCODE_16
@@ -85,11 +85,11 @@ jobs:
             script: test:parse_live_query:watchos
             watchOsVersion: '10.5'
             watchDeviceModel: Apple Watch Series 9 (45mm)
-            macosVersion: 15
+            macosVersion: 14
             developerDir: CI_XCODE_15
           - name: LiveQuery Module, watchOS 11
             script: test:parse_live_query:watchos
-            watchOsVersion: '11.1'
+            watchOsVersion: '11.5'
             watchDeviceModel: Apple Watch Series 10 (46mm)
             macosVersion: 15
             developerDir: CI_XCODE_16
@@ -97,11 +97,11 @@ jobs:
             script: test:parse_live_query:tvos
             tvOsVersion: '17.5'
             tvDeviceModel: Apple TV
-            macosVersion: 15
-            developerDir: CI_XCODE_16
+            macosVersion: 14
+            developerDir: CI_XCODE_15
           - name: LiveQuery Module, tvOS 18
             script: test:parse_live_query:tvos
-            tvOsVersion: '18.1'
+            tvOsVersion: '18.5'
             tvDeviceModel: Apple TV
             macosVersion: 15
             developerDir: CI_XCODE_16
@@ -184,7 +184,7 @@ jobs:
           plugin: xcode
           file: ${{ env.COVERAGE_PATH }}
   docs:
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/release-automated.yml b/.github/workflows/release-automated.yml
index 120671f1d..62f38abc9 100644
--- a/.github/workflows/release-automated.yml
+++ b/.github/workflows/release-automated.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches: [ master, release, alpha, beta ]
 env:
-  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
+  CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
 
 jobs:
   release:
diff --git a/.github/workflows/release-manual-docs.yml b/.github/workflows/release-manual-docs.yml
index 74847c626..bf0dee190 100644
--- a/.github/workflows/release-manual-docs.yml
+++ b/.github/workflows/release-manual-docs.yml
@@ -6,7 +6,7 @@ on:
         default: ''
         description: 'Version tag:' 
 env:
-  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
+  CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
 
 jobs:
   publish-docs:
diff --git a/Parse/Parse/Source/PFAnalytics.h b/Parse/Parse/Source/PFAnalytics.h
index e80368691..44ce0065d 100644
--- a/Parse/Parse/Source/PFAnalytics.h
+++ b/Parse/Parse/Source/PFAnalytics.h
@@ -9,7 +9,11 @@
 
 #import <Foundation/Foundation.h>
 
-@import Bolts;
+#if __has_include(<Bolts/BFTask.h>)
+#import <Bolts/BFTask.h>
+#else
+#import "BFTask.h"
+#endif
 
 #import "PFConstants.h"
 
diff --git a/Parse/Parse/Source/PFConstants.h b/Parse/Parse/Source/PFConstants.h
index 61125bf7b..2a6ed8ce9 100644
--- a/Parse/Parse/Source/PFConstants.h
+++ b/Parse/Parse/Source/PFConstants.h
@@ -8,7 +8,8 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <TargetConditionals.h>
+
+#include <TargetConditionals.h>
 
 ///--------------------------------------
 #pragma mark - SDK Version