diff --git a/CHANGES.md b/CHANGES.md
index 9eec0ef00..8e9b16b55 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,46 @@
+## Changes in 1.8.25 (2022-08-09)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.14](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.14)).
+- App Layout: Feature flag new App Layout ([#6406](https://github.com/vector-im/element-ios/issues/6406))
+- App Layout: Update All chats screen with latest design ([#6407](https://github.com/vector-im/element-ios/issues/6407))
+- App Layout: Change the App theme according to new design ([#6409](https://github.com/vector-im/element-ios/issues/6409))
+- App Layout: Implemented the new Space selector bottom sheet ([#6410](https://github.com/vector-im/element-ios/issues/6410))
+- Authentication: Update the ReCaptcha icon. ([#6427](https://github.com/vector-im/element-ios/issues/6427))
+- Location sharing: Improve live location sharing expanded map state when no more live location shares. ([#6488](https://github.com/vector-im/element-ios/issues/6488))
+- Location sharing: Render fallback UI when tile server unavailable. ([#6493](https://github.com/vector-im/element-ios/issues/6493))
+- In-app notifications will now also be delivered to Notification Centre. ([#6503](https://github.com/vector-im/element-ios/issues/6503))
+- Authentication: Don't show personalisation steps after registering with a generic SSO provider. ([#6530](https://github.com/vector-im/element-ios/issues/6530))
+
+🐛 Bugfixes
+
+- Room Directory: Show the "switch" button even if there are no public rooms in the homeserver's room directory. ([#4700](https://github.com/vector-im/element-ios/issues/4700))
+- Share Extension: Fix a bug where sending multiple images sometimes resulted in additional duplicates being sent. ([#5922](https://github.com/vector-im/element-ios/issues/5922))
+- Stop using an ephemeral web browser session for SSO authentication. ([#6462](https://github.com/vector-im/element-ios/issues/6462))
+- Media Attachments Viewer: Fixed an issue where dismissing GIFs would show the WebView playing the animation below the interaction transition animation. ([#6475](https://github.com/vector-im/element-ios/issues/6475))
+- Media: Fix a bug where the navigation bar shown when viewing an image wasn't taking the safe area into account. ([#6486](https://github.com/vector-im/element-ios/issues/6486))
+- Home: Use the correct status bar colour when using the dark theme with dark mode disabled. ([#6487](https://github.com/vector-im/element-ios/issues/6487))
+- Authentication: Always start a new authentication flow with the default homeserver (or the provisioning link if set). ([#6489](https://github.com/vector-im/element-ios/issues/6489))
+- Universal Links: Fix an infinite loop when handling a universal link for an unjoined room (or in some cases a crash). ([#6492](https://github.com/vector-im/element-ios/issues/6492))
+- App Layout: Conditionally hide favourite and people list tabs ([#6515](https://github.com/vector-im/element-ios/issues/6515))
+- Apply current theme to all the UI components ([#6526](https://github.com/vector-im/element-ios/issues/6526))
+- Some UI tweaks for New App Layout ([#6534](https://github.com/vector-im/element-ios/issues/6534))
+- Widgets: Fix a crash when loading the widget manager. ([#6539](https://github.com/vector-im/element-ios/issues/6539))
+
+⚠️ API Changes
+
+- Update the app's bundle name to show Element during SSO. ([#6462](https://github.com/vector-im/element-ios/issues/6462))
+
+📄 Documentation
+
+- Add docs/Customisation.md. ([#6473](https://github.com/vector-im/element-ios/issues/6473))
+
+🚧 In development 🚧
+
+- App Layout: Edit layout experiment ([#6079](https://github.com/vector-im/element-ios/issues/6079))
+
+
 ## Changes in 1.8.24 (2022-07-26)
 
 ✨ Features
diff --git a/Podfile b/Podfile
index fdaa63bdf..4b6d3de3a 100644
--- a/Podfile
+++ b/Podfile
@@ -16,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.23.13'
+$matrixSDKVersion = '= 0.23.14'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 9342eb19a..cbd9fced3 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -56,9 +56,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.13):
-    - MatrixSDK/Core (= 0.23.13)
-  - MatrixSDK/Core (0.23.13):
+  - MatrixSDK (0.23.14):
+    - MatrixSDK/Core (= 0.23.14)
+  - MatrixSDK/Core (0.23.14):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -66,9 +66,9 @@ PODS:
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/CryptoSDK (0.23.13):
+  - MatrixSDK/CryptoSDK (0.23.14):
     - MatrixSDKCrypto (= 0.1.0)
-  - MatrixSDK/JingleCallStack (0.23.13):
+  - MatrixSDK/JingleCallStack (0.23.14):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.1.0)
@@ -123,8 +123,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.13)
-  - MatrixSDK/JingleCallStack (= 0.23.13)
+  - MatrixSDK (= 0.23.14)
+  - MatrixSDK/JingleCallStack (= 0.23.14)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -221,7 +221,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 4e14176a819982d9aec9d19e30afad9f63968a32
+  MatrixSDK: a62f8aafa25623f261599fdc2e734043da548440
   MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c7d08e5d0654296048d53c9c6720783efcf897bd
+PODFILE CHECKSUM: 010dde83f230d559fc7987ccdbb0f0069418a319
 
 COCOAPODS: 1.11.2
diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index 4e299eba2..6eba9ae71 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1200"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,7 +16,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-               BuildableName = "Element.app"
+               BuildableName = "Riot.app"
                BlueprintName = "Riot"
                ReferencedContainer = "container:Riot.xcodeproj">
             </BuildableReference>
@@ -27,12 +28,13 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      disableMainThreadChecker = "YES">
+      disableMainThreadChecker = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "NO">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Element.app"
+            BuildableName = "Riot.app"
             BlueprintName = "Riot"
             ReferencedContainer = "container:Riot.xcodeproj">
          </BuildableReference>
@@ -49,6 +51,8 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <CommandLineArguments>
+      </CommandLineArguments>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -66,11 +70,13 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Element.app"
+            BuildableName = "Riot.app"
             BlueprintName = "Riot"
             ReferencedContainer = "container:Riot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -83,11 +89,13 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
-            BuildableName = "Element.app"
+            BuildableName = "Riot.app"
             BlueprintName = "Riot"
             ReferencedContainer = "container:Riot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/changelog.d/4700.bugfix b/changelog.d/4700.bugfix
deleted file mode 100644
index 6026c6108..000000000
--- a/changelog.d/4700.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Room Directory: Show the "switch" button even if there are no public rooms in the homeserver's room directory.
diff --git a/changelog.d/5922.bugfix b/changelog.d/5922.bugfix
deleted file mode 100644
index 0350c46a3..000000000
--- a/changelog.d/5922.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Share Extension: Fix a bug where sending multiple images sometimes resulted in additional duplicates being sent.
diff --git a/changelog.d/6079.wip.change b/changelog.d/6079.wip.change
deleted file mode 100644
index c5baf13d7..000000000
--- a/changelog.d/6079.wip.change
+++ /dev/null
@@ -1 +0,0 @@
-App Layout: Edit layout experiment
diff --git a/changelog.d/6406.change b/changelog.d/6406.change
deleted file mode 100644
index 5e176afd6..000000000
--- a/changelog.d/6406.change
+++ /dev/null
@@ -1 +0,0 @@
-App Layout: Feature flag new App Layout
diff --git a/changelog.d/6407.change b/changelog.d/6407.change
deleted file mode 100644
index ed0aae363..000000000
--- a/changelog.d/6407.change
+++ /dev/null
@@ -1 +0,0 @@
-App Layout: Update All chats screen with latest design
diff --git a/changelog.d/6409.change b/changelog.d/6409.change
deleted file mode 100644
index 279445235..000000000
--- a/changelog.d/6409.change
+++ /dev/null
@@ -1 +0,0 @@
-App Layout: Change the App theme according to new design
diff --git a/changelog.d/6410.change b/changelog.d/6410.change
deleted file mode 100644
index 9ea313d80..000000000
--- a/changelog.d/6410.change
+++ /dev/null
@@ -1 +0,0 @@
-App Layout: Implemented the new Space selector bottom sheet
diff --git a/changelog.d/6427.change b/changelog.d/6427.change
deleted file mode 100644
index 619071bee..000000000
--- a/changelog.d/6427.change
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Update the ReCaptcha icon.
diff --git a/changelog.d/6462.api b/changelog.d/6462.api
deleted file mode 100644
index 2a15141cf..000000000
--- a/changelog.d/6462.api
+++ /dev/null
@@ -1 +0,0 @@
-Update the app's bundle name to show Element during SSO.
diff --git a/changelog.d/6462.bugfix b/changelog.d/6462.bugfix
deleted file mode 100644
index f005fe225..000000000
--- a/changelog.d/6462.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Stop using an ephemeral web browser session for SSO authentication.
diff --git a/changelog.d/6473.doc b/changelog.d/6473.doc
deleted file mode 100644
index 441d6cbfa..000000000
--- a/changelog.d/6473.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add docs/Customisation.md.
diff --git a/changelog.d/6475.bugfix b/changelog.d/6475.bugfix
deleted file mode 100644
index 40bc7735e..000000000
--- a/changelog.d/6475.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Media Attachments Viewer: Fixed an issue where dismissing GIFs would show the WebView playing the animation below the interaction transition animation.
\ No newline at end of file
diff --git a/changelog.d/6486.bugfix b/changelog.d/6486.bugfix
deleted file mode 100644
index 3cbb29083..000000000
--- a/changelog.d/6486.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Media: Fix a bug where the navigation bar shown when viewing an image wasn't taking the safe area into account.
diff --git a/changelog.d/6487.bugfix b/changelog.d/6487.bugfix
deleted file mode 100644
index 6f040ded3..000000000
--- a/changelog.d/6487.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Home: Use the correct status bar colour when using the dark theme with dark mode disabled.
diff --git a/changelog.d/6488.change b/changelog.d/6488.change
deleted file mode 100644
index dbd0379b4..000000000
--- a/changelog.d/6488.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Improve live location sharing expanded map state when no more live location shares.
diff --git a/changelog.d/6489.bugfix b/changelog.d/6489.bugfix
deleted file mode 100644
index b4b416e05..000000000
--- a/changelog.d/6489.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Always start a new authentication flow with the default homeserver (or the provisioning link if set).
diff --git a/changelog.d/6492.bugfix b/changelog.d/6492.bugfix
deleted file mode 100644
index 563447802..000000000
--- a/changelog.d/6492.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Universal Links: Fix an infinite loop when handling a universal link for an unjoined room (or in some cases a crash).
diff --git a/changelog.d/6493.change b/changelog.d/6493.change
deleted file mode 100644
index c417a96f6..000000000
--- a/changelog.d/6493.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Render fallback UI when tile server unavailable.
diff --git a/changelog.d/6503.change b/changelog.d/6503.change
deleted file mode 100644
index 7cef760c2..000000000
--- a/changelog.d/6503.change
+++ /dev/null
@@ -1 +0,0 @@
-In-app notifications will now also be delivered to Notification Centre.
diff --git a/changelog.d/6515.bugfix b/changelog.d/6515.bugfix
deleted file mode 100644
index 2c37e186e..000000000
--- a/changelog.d/6515.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-App Layout: Conditionally hide favourite and people list tabs
diff --git a/changelog.d/6526.bugfix b/changelog.d/6526.bugfix
deleted file mode 100644
index 852ff8d1f..000000000
--- a/changelog.d/6526.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Apply current theme to all the UI components
diff --git a/changelog.d/6530.change b/changelog.d/6530.change
deleted file mode 100644
index 29b08d756..000000000
--- a/changelog.d/6530.change
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Don't show personalisation steps after registering with a generic SSO provider.
diff --git a/changelog.d/6534.bugfix b/changelog.d/6534.bugfix
deleted file mode 100644
index 8316a6fee..000000000
--- a/changelog.d/6534.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Some UI tweaks for New App Layout
diff --git a/changelog.d/6539.bugfix b/changelog.d/6539.bugfix
deleted file mode 100644
index 392f528b1..000000000
--- a/changelog.d/6539.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Widgets: Fix a crash when loading the widget manager.