From 89d4fe0806bbf8ff30067301c64d6dfcd6995567 Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Fri, 2 Jul 2021 16:02:00 -0400
Subject: [PATCH 01/11] Update Block Editor Settings for API changes and dotCom
 Support

---
 Podfile                                       |  4 +-
 Podfile.lock                                  | 11 ++-
 .../Services/BlockEditorSettingsService.swift | 11 ++-
 .../BlockEditorSettingsServiceTests.swift     | 95 +++++++++++++++++--
 .../MockWordPressComRestApi.swift             | 30 ++++++
 5 files changed, 138 insertions(+), 13 deletions(-)

diff --git a/Podfile b/Podfile
index fd51033f72c2..edfaa4a1f74d 100644
--- a/Podfile
+++ b/Podfile
@@ -47,10 +47,10 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.37.0-beta'
+    # pod 'WordPressKit', '~> 4.37.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
-    # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
+    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '87784aa17d00082a07bb38bcbbb09e4ce13243fb'
     # pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
index 049cb622c5ae..9c220512e362 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -553,7 +553,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
   - WordPressAuthenticator (~> 1.39.0)
-  - WordPressKit (~> 4.37.0-beta)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `87784aa17d00082a07bb38bcbbb09e4ce13243fb`)
   - WordPressMocks (~> 0.0.13)
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1)
@@ -605,7 +605,6 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressKit
     - WordPressMocks
     - WordPressShared
     - WPMediaPicker
@@ -711,6 +710,9 @@ EXTERNAL SOURCES:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.57.0-alpha1
+  WordPressKit:
+    :commit: 87784aa17d00082a07bb38bcbbb09e4ce13243fb
+    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/Yoga.podspec.json
 
@@ -726,6 +728,9 @@ CHECKOUT OPTIONS:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.57.0-alpha1
+  WordPressKit:
+    :commit: 87784aa17d00082a07bb38bcbbb09e4ce13243fb
+    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
   1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
@@ -826,6 +831,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 8b2c79935a27e464f11211a1f22df322659267d1
+PODFILE CHECKSUM: 28cc079da373791899780e4546add6859ddf8f95
 
 COCOAPODS: 1.10.1
diff --git a/WordPress/Classes/Services/BlockEditorSettingsService.swift b/WordPress/Classes/Services/BlockEditorSettingsService.swift
index 0127c38500e3..7b74c4503b4a 100644
--- a/WordPress/Classes/Services/BlockEditorSettingsService.swift
+++ b/WordPress/Classes/Services/BlockEditorSettingsService.swift
@@ -14,7 +14,7 @@ class BlockEditorSettingsService {
 
     convenience init?(blog: Blog, context: NSManagedObjectContext) {
         let remoteAPI: WordPressRestApi
-        if blog.isAccessibleThroughWPCom(),
+        if blog.isHostedAtWPcom,
            blog.dotComID?.intValue != nil,
            let restAPI = blog.wordPressComRestApi() {
             remoteAPI = restAPI
@@ -115,7 +115,14 @@ private extension BlockEditorSettingsService {
 // MARK: Editor Global Styles support
 private extension BlockEditorSettingsService {
     func fetchBlockEditorSettings(_ completion: @escaping BlockEditorSettingsServiceCompletion) {
-        remote.fetchBlockEditorSettings { [weak self] (response) in
+        /*
+         * This endpoint was released as part of WP 5.8 with the __experimental flag.
+         * Starting with Gutenberg 11.1 the endpoint will be available without the __experimental flag.
+         * Gutenberg 11.1 will be included in WP 5.9.
+         * These tests just ensure we are using the appropriate endpoints for each scenario based on when this was released.
+        */
+        let requiresExperimental = !(blog.isHostedAtWPcom || blog.hasRequiredWordPressVersion("5.9"))
+        remote.fetchBlockEditorSettings(forSiteID: blog.dotComID?.intValue, requiresExperimental: requiresExperimental) { [weak self] (response) in
             guard let `self` = self else { return }
             switch response {
             case .success(let remoteSettings):
diff --git a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
index b1a1f469afe0..8113861fa073 100644
--- a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
+++ b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
@@ -20,10 +20,10 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         contextManager = TestContextManager()
         context = contextManager.mainContext
         mockRemoteApi = MockWordPressComRestApi()
-        blog = ModelTestHelper.insertDotComBlog(context: context)
-        blog.dotComID = NSNumber(value: 1)
-        blog.account?.authToken = "auth"
-        blog.setValue("5.8", forOption: "software_version")
+        blog = BlogBuilder(context)
+            .with(wordPressVersion: "5.9")
+            .with(isHostedAtWPCom: true)
+            .build()
 
         service = BlockEditorSettingsService(blog: blog, remoteAPI: mockRemoteApi, context: context)
 
@@ -86,7 +86,7 @@ class BlockEditorSettingsServiceTests: XCTestCase {
 
     private func validateThemeResponse() {
         XCTAssertTrue(self.mockRemoteApi.getMethodCalled)
-        XCTAssertEqual(self.mockRemoteApi.URLStringPassedIn!, "/wp/v2/sites/1/themes")
+        XCTAssertEqual(self.mockRemoteApi.URLStringPassedIn!, "/wp/v2/sites/\(blog.dotComID!.intValue)/themes")
         XCTAssertEqual((self.mockRemoteApi.parametersPassedIn as! [String: String])["status"], "active")
         XCTAssertGreaterThan(self.blog.blockEditorSettings!.colors!.count, 0)
         XCTAssertGreaterThan(self.blog.blockEditorSettings!.gradients!.count, 0)
@@ -191,9 +191,92 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         XCTAssertEqual(self.blog.blockEditorSettings?.checksum, originalChecksum)
     }
 
+    func testFetchBlockEditorSettings_Org5_8Site() {
+        blog = BlogBuilder(context)
+            .with(wordPressVersion: "5.8")
+            .with(isHostedAtWPCom: false)
+            .build()
+
+        try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
+        let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
+        let mockOrgRemoteApi = MockWordPressOrgRestApi()
+        service = BlockEditorSettingsService(blog: blog, remoteAPI: mockOrgRemoteApi, context: context)
+
+        let waitExpectation = expectation(description: "Theme should be successfully fetched")
+        service.fetchSettings { (hasChanges, result) in
+            waitExpectation.fulfill()
+        }
+        mockOrgRemoteApi.completionPassedIn!(.success(mockedResponse), HTTPURLResponse())
+        waitForExpectations(timeout: expectationTimeout)
+
+        XCTAssertTrue(mockOrgRemoteApi.getMethodCalled)
+        XCTAssertEqual(mockOrgRemoteApi.URLStringPassedIn!, "/__experimental/wp-block-editor/v1/settings")
+        XCTAssertEqual((mockOrgRemoteApi.parametersPassedIn as! [String: String])["context"], "mobile")
+    }
+
+    func testFetchBlockEditorSettings_Org5_9Site() {
+        blog = BlogBuilder(context)
+            .with(wordPressVersion: "5.9")
+            .with(isHostedAtWPCom: false)
+            .build()
+
+        try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
+        let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
+        let mockOrgRemoteApi = MockWordPressOrgRestApi()
+        service = BlockEditorSettingsService(blog: blog, remoteAPI: mockOrgRemoteApi, context: context)
+
+        let waitExpectation = expectation(description: "Theme should be successfully fetched")
+        service.fetchSettings { (hasChanges, result) in
+            waitExpectation.fulfill()
+        }
+        mockOrgRemoteApi.completionPassedIn!(.success(mockedResponse), HTTPURLResponse())
+        waitForExpectations(timeout: expectationTimeout)
+
+        XCTAssertTrue(mockOrgRemoteApi.getMethodCalled)
+        XCTAssertEqual(mockOrgRemoteApi.URLStringPassedIn!, "/wp-block-editor/v1/settings")
+        XCTAssertEqual((mockOrgRemoteApi.parametersPassedIn as! [String: String])["context"], "mobile")
+    }
+
+    func testFetchBlockEditorSettings_Com5_8Site() {
+        blog = BlogBuilder(context)
+            .with(wordPressVersion: "5.8")
+            .with(isHostedAtWPCom: true)
+            .build()
+
+        service = BlockEditorSettingsService(blog: blog, remoteAPI: mockRemoteApi, context: context)
+
+        try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
+        let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
+        let waitExpectation = expectation(description: "Theme should be successfully fetched")
+        service.fetchSettings { (hasChanges, result) in
+            waitExpectation.fulfill()
+        }
+        mockRemoteApi.successBlockPassedIn!(mockedResponse, HTTPURLResponse())
+        waitForExpectations(timeout: expectationTimeout)
+
+        XCTAssertTrue(self.mockRemoteApi.getMethodCalled)
+        XCTAssertEqual(self.mockRemoteApi.URLStringPassedIn!, "/wp-block-editor/v1/sites/\(blog.dotComID!.intValue)/settings")
+        XCTAssertEqual((self.mockRemoteApi.parametersPassedIn as! [String: String])["context"], "mobile")
+    }
+
+    func testFetchBlockEditorSettings_Com5_9Site() {
+        try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
+        let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
+        let waitExpectation = expectation(description: "Theme should be successfully fetched")
+        service.fetchSettings { (hasChanges, result) in
+            waitExpectation.fulfill()
+        }
+        mockRemoteApi.successBlockPassedIn!(mockedResponse, HTTPURLResponse())
+        waitForExpectations(timeout: expectationTimeout)
+
+        XCTAssertTrue(self.mockRemoteApi.getMethodCalled)
+        XCTAssertEqual(self.mockRemoteApi.URLStringPassedIn!, "/wp-block-editor/v1/sites/\(blog.dotComID!.intValue)/settings")
+        XCTAssertEqual((self.mockRemoteApi.parametersPassedIn as! [String: String])["context"], "mobile")
+    }
+
     private func validateBlockEditorSettingsResponse(isGlobalStyles: Bool = true) {
         XCTAssertTrue(self.mockRemoteApi.getMethodCalled)
-        XCTAssertEqual(self.mockRemoteApi.URLStringPassedIn!, "/__experimental/wp-block-editor/v1/settings")
+        XCTAssertEqual(self.mockRemoteApi.URLStringPassedIn!, "/wp-block-editor/v1/sites/\(blog.dotComID!.intValue)/settings")
         XCTAssertEqual((self.mockRemoteApi.parametersPassedIn as! [String: String])["context"], "mobile")
 
         if isGlobalStyles {
diff --git a/WordPress/WordPressTest/MockWordPressComRestApi.swift b/WordPress/WordPressTest/MockWordPressComRestApi.swift
index 7f63f6db514e..b8cdcdd42259 100644
--- a/WordPress/WordPressTest/MockWordPressComRestApi.swift
+++ b/WordPress/WordPressTest/MockWordPressComRestApi.swift
@@ -56,3 +56,33 @@ class MockWordPressComRestApi: WordPressComRestApi {
         return method
     }
 }
+
+class MockWordPressOrgRestApi: WordPressOrgRestApi {
+    var getMethodCalled = false
+    var URLStringPassedIn: String?
+    var parametersPassedIn: AnyObject?
+    var completionPassedIn: WordPressOrgRestApi.Completion?
+
+    init() {
+        super.init(apiBase: URL(string: "https://example.com")!)
+    }
+
+    override func GET(_ path: String, parameters: [String: AnyObject]?, completion: @escaping WordPressOrgRestApi.Completion) -> Progress? {
+        getMethodCalled = true
+        URLStringPassedIn = path
+        parametersPassedIn = parameters as AnyObject?
+        completionPassedIn = completion
+
+        return Progress()
+    }
+
+    @objc func methodCalled() -> String {
+
+        var method = "Unknown"
+        if getMethodCalled {
+            method = "GET"
+        }
+
+        return method
+    }
+}

From 7a1747669a937a603ae21cea8dac8086b3d21d69 Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Tue, 6 Jul 2021 14:54:50 -0400
Subject: [PATCH 02/11] Update WordPressKit

---
 Podfile      | 2 +-
 Podfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Podfile b/Podfile
index edfaa4a1f74d..8fc420d996e2 100644
--- a/Podfile
+++ b/Podfile
@@ -50,7 +50,7 @@ def wordpress_kit
     # pod 'WordPressKit', '~> 4.37.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
-    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '87784aa17d00082a07bb38bcbbb09e4ce13243fb'
+    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'd87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6'
     # pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
index 9c220512e362..1d7c62cf9702 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -553,7 +553,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
   - WordPressAuthenticator (~> 1.39.0)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `87784aa17d00082a07bb38bcbbb09e4ce13243fb`)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `d87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6`)
   - WordPressMocks (~> 0.0.13)
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1)
@@ -711,7 +711,7 @@ EXTERNAL SOURCES:
     :submodules: true
     :tag: v1.57.0-alpha1
   WordPressKit:
-    :commit: 87784aa17d00082a07bb38bcbbb09e4ce13243fb
+    :commit: d87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/Yoga.podspec.json
@@ -729,7 +729,7 @@ CHECKOUT OPTIONS:
     :submodules: true
     :tag: v1.57.0-alpha1
   WordPressKit:
-    :commit: 87784aa17d00082a07bb38bcbbb09e4ce13243fb
+    :commit: d87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
@@ -831,6 +831,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 28cc079da373791899780e4546add6859ddf8f95
+PODFILE CHECKSUM: 41f7635982069dbf10971ee47c048b9c28e48109
 
 COCOAPODS: 1.10.1

From 38c5459040c7c9f0ccabff522729198d0b42044c Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Wed, 7 Jul 2021 12:23:17 -0400
Subject: [PATCH 03/11] Update Block-editor-settings to support cases that use
 the non-experimental path

---
 .../Services/BlockEditorSettingsService.swift | 20 ++++++++++++++-----
 .../BlockEditorSettingsServiceTests.swift     |  6 +++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/WordPress/Classes/Services/BlockEditorSettingsService.swift b/WordPress/Classes/Services/BlockEditorSettingsService.swift
index 7b74c4503b4a..14b80cbc9f31 100644
--- a/WordPress/Classes/Services/BlockEditorSettingsService.swift
+++ b/WordPress/Classes/Services/BlockEditorSettingsService.swift
@@ -14,7 +14,7 @@ class BlockEditorSettingsService {
 
     convenience init?(blog: Blog, context: NSManagedObjectContext) {
         let remoteAPI: WordPressRestApi
-        if blog.isHostedAtWPcom,
+        if blog.isAccessibleThroughWPCom(),
            blog.dotComID?.intValue != nil,
            let restAPI = blog.wordPressComRestApi() {
             remoteAPI = restAPI
@@ -114,14 +114,19 @@ private extension BlockEditorSettingsService {
 
 // MARK: Editor Global Styles support
 private extension BlockEditorSettingsService {
-    func fetchBlockEditorSettings(_ completion: @escaping BlockEditorSettingsServiceCompletion) {
+    func fetchBlockEditorSettings(tryExperimental: Bool = false, _ completion: @escaping BlockEditorSettingsServiceCompletion) {
         /*
          * This endpoint was released as part of WP 5.8 with the __experimental flag.
          * Starting with Gutenberg 11.1 the endpoint will be available without the __experimental flag.
          * Gutenberg 11.1 will be included in WP 5.9.
          * These tests just ensure we are using the appropriate endpoints for each scenario based on when this was released.
-        */
-        let requiresExperimental = !(blog.isHostedAtWPcom || blog.hasRequiredWordPressVersion("5.9"))
+         *
+         * We'll try the non-experimental path first but then if that fails (which should only be for base WP 5.8 installs)
+         * then we'll fall back and try the experimental endpoint.
+         */
+        let hasExperimentalEndpoint = blog.hasRequiredWordPressVersion("5.8") && !blog.hasRequiredWordPressVersion("5.9")
+        let requiresExperimental = hasExperimentalEndpoint ? tryExperimental : false
+
         remote.fetchBlockEditorSettings(forSiteID: blog.dotComID?.intValue, requiresExperimental: requiresExperimental) { [weak self] (response) in
             guard let `self` = self else { return }
             switch response {
@@ -131,7 +136,12 @@ private extension BlockEditorSettingsService {
                     self.updateBlockEditorSettingsCache(originalChecksum: originalChecksum, remoteSettings: remoteSettings, completion: completion)
                 }
             case .failure(let error):
-                DDLogError("Error loading Block Editor Settings: \(error)")
+                if !tryExperimental && hasExperimentalEndpoint {
+                    self.fetchBlockEditorSettings(tryExperimental: true, completion)
+                } else {
+                    DDLogError("Error loading Block Editor Settings: \(error)")
+                    completion(false, nil)
+                }
             }
         }
     }
diff --git a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
index 8113861fa073..7403b91d611e 100644
--- a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
+++ b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
@@ -194,7 +194,7 @@ class BlockEditorSettingsServiceTests: XCTestCase {
     func testFetchBlockEditorSettings_Org5_8Site() {
         blog = BlogBuilder(context)
             .with(wordPressVersion: "5.8")
-            .with(isHostedAtWPCom: false)
+            .withAnAccount()
             .build()
 
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
@@ -206,6 +206,10 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         service.fetchSettings { (hasChanges, result) in
             waitExpectation.fulfill()
         }
+
+        // The app will call the none-experimental path first but fail because of compatibility reasons
+        mockOrgRemoteApi.completionPassedIn!(.failure(NSError(domain: "test", code: 404, userInfo: nil)), HTTPURLResponse())
+        // The app will then retry the experimental path.
         mockOrgRemoteApi.completionPassedIn!(.success(mockedResponse), HTTPURLResponse())
         waitForExpectations(timeout: expectationTimeout)
 

From 469e3b2e18528a3cdedbdabe12237380a7a1ccdd Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Fri, 9 Jul 2021 15:42:33 -0400
Subject: [PATCH 04/11] Remove support for the experimental path and fallback
 to themes

---
 Podfile                                       |   2 +-
 Podfile.lock                                  |  12 +-
 .../Services/BlockEditorSettingsService.swift | 115 +++++++++--------
 .../Gutenberg/GutenbergViewController.swift   |  13 +-
 .../BlockEditorSettingsServiceTests.swift     | 121 +++++++++++-------
 5 files changed, 158 insertions(+), 105 deletions(-)

diff --git a/Podfile b/Podfile
index 8fc420d996e2..edbeab09e212 100644
--- a/Podfile
+++ b/Podfile
@@ -50,7 +50,7 @@ def wordpress_kit
     # pod 'WordPressKit', '~> 4.37.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
-    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'd87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6'
+    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'cc6836fc78cadae5f825e674292fe8b87998a850'
     # pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
index 1d7c62cf9702..e980865aa257 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -452,7 +452,7 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.37.0-beta.4):
+  - WordPressKit (4.37.0-beta.6):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -553,7 +553,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
   - WordPressAuthenticator (~> 1.39.0)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `d87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6`)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `cc6836fc78cadae5f825e674292fe8b87998a850`)
   - WordPressMocks (~> 0.0.13)
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1)
@@ -711,7 +711,7 @@ EXTERNAL SOURCES:
     :submodules: true
     :tag: v1.57.0-alpha1
   WordPressKit:
-    :commit: d87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6
+    :commit: cc6836fc78cadae5f825e674292fe8b87998a850
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/Yoga.podspec.json
@@ -729,7 +729,7 @@ CHECKOUT OPTIONS:
     :submodules: true
     :tag: v1.57.0-alpha1
   WordPressKit:
-    :commit: d87ce5fc419fe9e3ede31d5c5d8c32bfa3b67ab6
+    :commit: cc6836fc78cadae5f825e674292fe8b87998a850
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
@@ -815,7 +815,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82
   WordPress-Editor-iOS: 068b32d02870464ff3cb9e3172e74234e13ed88c
   WordPressAuthenticator: c50b9737d6f459b1010bd07daa9885d19505c504
-  WordPressKit: 3bfdfb739d6f5354144ee35f9fa7f27b266be9c8
+  WordPressKit: b91ed01a13f63e9ec824a93290fadf2f0d86bc28
   WordPressMocks: dfac50a938ac74dddf5f7cce5a9110126408dd19
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: 7cd64cfaf76ce0cfd78d6a544702c4c774a29919
@@ -831,6 +831,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 41f7635982069dbf10971ee47c048b9c28e48109
+PODFILE CHECKSUM: 94622776e32c0cb8ec2ec0a81ee078bed4f76bc0
 
 COCOAPODS: 1.10.1
diff --git a/WordPress/Classes/Services/BlockEditorSettingsService.swift b/WordPress/Classes/Services/BlockEditorSettingsService.swift
index 14b80cbc9f31..3bdc3d85816d 100644
--- a/WordPress/Classes/Services/BlockEditorSettingsService.swift
+++ b/WordPress/Classes/Services/BlockEditorSettingsService.swift
@@ -2,7 +2,16 @@ import Foundation
 import WordPressKit
 
 class BlockEditorSettingsService {
-    typealias BlockEditorSettingsServiceCompletion = (_ hasChanges: Bool, _ blockEditorSettings: BlockEditorSettings?) -> Void
+    struct SettingsServiceResult {
+        let hasChanges: Bool
+        let blockEditorSettings: BlockEditorSettings?
+    }
+
+    enum BlockEditorSettingsServiceError: Int, Error {
+        case blogNotFound
+    }
+
+    typealias BlockEditorSettingsServiceCompletion = (Swift.Result<SettingsServiceResult, Error>) -> Void
 
     let blog: Blog
     let remote: BlockEditorSettingsServiceRemote
@@ -54,8 +63,9 @@ private extension BlockEditorSettingsService {
                     let originalChecksum = self.blog.blockEditorSettings?.checksum ?? ""
                     self.updateEditorThemeCache(originalChecksum: originalChecksum, editorTheme: editorTheme, completion: completion)
                 }
-            case .failure(let error):
-                DDLogError("Error loading active theme: \(error)")
+            case .failure(let err):
+                DDLogError("Error loading active theme: \(err)")
+                completion(.failure(err))
             }
         }
     }
@@ -64,7 +74,8 @@ private extension BlockEditorSettingsService {
         let newChecksum = editorTheme?.checksum ?? ""
         guard originalChecksum != newChecksum else {
             /// The fetched Editor Theme is the same as the cached one so respond with no new changes.
-            completion(false, self.blog.blockEditorSettings)
+            let result = SettingsServiceResult(hasChanges: false, blockEditorSettings: self.blog.blockEditorSettings)
+            completion(.success(result))
             return
         }
 
@@ -76,27 +87,29 @@ private extension BlockEditorSettingsService {
 
         /// The fetched Editor Theme is different than the cached one so persist the new one and delete the old one.
         context.perform {
-            self.persistEditorThemeToCoreData(blogID: self.blog.objectID, editorTheme: editorTheme) { success in
-                guard success else {
-                    completion(false, nil)
-                    return
-                }
-
-                self.context.perform {
-                    completion(true, self.blog.blockEditorSettings)
+            self.persistEditorThemeToCoreData(blogID: self.blog.objectID, editorTheme: editorTheme) { callback in
+                switch callback {
+                case .success:
+                    self.context.perform {
+                        let result = SettingsServiceResult(hasChanges: true, blockEditorSettings: self.blog.blockEditorSettings)
+                        completion(.success(result))
+                    }
+                case .failure(let err):
+                    completion(.failure(err))
                 }
             }
         }
     }
 
-    func persistEditorThemeToCoreData(blogID: NSManagedObjectID, editorTheme: RemoteEditorTheme, completion: @escaping (_ success: Bool) -> Void) {
+    func persistEditorThemeToCoreData(blogID: NSManagedObjectID, editorTheme: RemoteEditorTheme, completion: @escaping (Swift.Result<Void, Error>) -> Void) {
         let parsingContext = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
         parsingContext.parent = context
         parsingContext.mergePolicy =  NSMergePolicy.mergeByPropertyObjectTrump
 
         parsingContext.perform {
             guard let blog = parsingContext.object(with: blogID) as? Blog else {
-                completion(false)
+                let err = BlockEditorSettingsServiceError.blogNotFound
+                completion(.failure(err))
                 return
             }
 
@@ -106,28 +119,21 @@ private extension BlockEditorSettingsService {
             }
 
             blog.blockEditorSettings = BlockEditorSettings(editorTheme: editorTheme, context: parsingContext)
-            try? parsingContext.save()
-            completion(true)
+            do {
+                try parsingContext.save()
+            } catch let err {
+                completion(.failure(err))
+            }
+
+            completion(.success(()))
         }
     }
 }
 
 // MARK: Editor Global Styles support
 private extension BlockEditorSettingsService {
-    func fetchBlockEditorSettings(tryExperimental: Bool = false, _ completion: @escaping BlockEditorSettingsServiceCompletion) {
-        /*
-         * This endpoint was released as part of WP 5.8 with the __experimental flag.
-         * Starting with Gutenberg 11.1 the endpoint will be available without the __experimental flag.
-         * Gutenberg 11.1 will be included in WP 5.9.
-         * These tests just ensure we are using the appropriate endpoints for each scenario based on when this was released.
-         *
-         * We'll try the non-experimental path first but then if that fails (which should only be for base WP 5.8 installs)
-         * then we'll fall back and try the experimental endpoint.
-         */
-        let hasExperimentalEndpoint = blog.hasRequiredWordPressVersion("5.8") && !blog.hasRequiredWordPressVersion("5.9")
-        let requiresExperimental = hasExperimentalEndpoint ? tryExperimental : false
-
-        remote.fetchBlockEditorSettings(forSiteID: blog.dotComID?.intValue, requiresExperimental: requiresExperimental) { [weak self] (response) in
+    func fetchBlockEditorSettings(_ completion: @escaping BlockEditorSettingsServiceCompletion) {
+        remote.fetchBlockEditorSettings(forSiteID: blog.dotComID?.intValue) { [weak self] (response) in
             guard let `self` = self else { return }
             switch response {
             case .success(let remoteSettings):
@@ -135,13 +141,11 @@ private extension BlockEditorSettingsService {
                     let originalChecksum = self.blog.blockEditorSettings?.checksum ?? ""
                     self.updateBlockEditorSettingsCache(originalChecksum: originalChecksum, remoteSettings: remoteSettings, completion: completion)
                 }
-            case .failure(let error):
-                if !tryExperimental && hasExperimentalEndpoint {
-                    self.fetchBlockEditorSettings(tryExperimental: true, completion)
-                } else {
-                    DDLogError("Error loading Block Editor Settings: \(error)")
-                    completion(false, nil)
-                }
+            case .failure(let err):
+                DDLogError("Error fetching editor settings: \(err)")
+                // The user may not have the gutenberg plugin installed so try /wp/v2/themes to maintain feature support.
+                // In WP 5.9 we may be able to skip this attempt.
+                self.fetchTheme(completion)
             }
         }
     }
@@ -150,7 +154,8 @@ private extension BlockEditorSettingsService {
         let newChecksum = remoteSettings?.checksum ?? ""
         guard originalChecksum != newChecksum else {
             /// The fetched Block Editor Settings is the same as the cached one so respond with no new changes.
-            completion(false, self.blog.blockEditorSettings)
+            let result = SettingsServiceResult(hasChanges: false, blockEditorSettings: self.blog.blockEditorSettings)
+            completion(.success(result))
             return
         }
 
@@ -162,27 +167,29 @@ private extension BlockEditorSettingsService {
 
         /// The fetched Block Editor Settings is different than the cached one so persist the new one and delete the old one.
         context.perform {
-            self.persistBlockEditorSettingsToCoreData(blogID: self.blog.objectID, remoteSettings: remoteSettings) { success in
-                guard success else {
-                    completion(false, nil)
-                    return
-                }
-
-                self.context.perform {
-                    completion(true, self.blog.blockEditorSettings)
+            self.persistBlockEditorSettingsToCoreData(blogID: self.blog.objectID, remoteSettings: remoteSettings) { callback in
+                switch callback {
+                case .success:
+                    self.context.perform {
+                        let result = SettingsServiceResult(hasChanges: true, blockEditorSettings: self.blog.blockEditorSettings)
+                        completion(.success(result))
+                    }
+                case .failure(let err):
+                    completion(.failure(err))
                 }
             }
         }
     }
 
-    func persistBlockEditorSettingsToCoreData(blogID: NSManagedObjectID, remoteSettings: RemoteBlockEditorSettings, completion: @escaping (_ success: Bool) -> Void) {
+    func persistBlockEditorSettingsToCoreData(blogID: NSManagedObjectID, remoteSettings: RemoteBlockEditorSettings, completion: @escaping (Swift.Result<Void, Error>) -> Void) {
         let parsingContext = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
         parsingContext.parent = context
         parsingContext.mergePolicy =  NSMergePolicy.mergeByPropertyObjectTrump
 
         parsingContext.perform {
             guard let blog = parsingContext.object(with: blogID) as? Blog else {
-                completion(false)
+                let err = BlockEditorSettingsServiceError.blogNotFound
+                completion(.failure(err))
                 return
             }
 
@@ -192,8 +199,13 @@ private extension BlockEditorSettingsService {
             }
 
             blog.blockEditorSettings = BlockEditorSettings(remoteSettings: remoteSettings, context: parsingContext)
-            try? parsingContext.save()
-            completion(true)
+            do {
+                try parsingContext.save()
+            } catch let err {
+                completion(.failure(err))
+            }
+
+            completion(.success(()))
         }
     }
 }
@@ -206,7 +218,8 @@ private extension BlockEditorSettingsService {
                 // Block Editor Settings nullify on delete
                 self.context.delete(blockEditorSettings)
             }
-            completion(true, nil)
+            let result = SettingsServiceResult(hasChanges: true, blockEditorSettings: nil)
+            completion(.success(result))
         }
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
index f68c29baaf5e..36d80a002583 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
@@ -1206,9 +1206,16 @@ extension GutenbergViewController {
     }
 
     private func fetchBlockSettings() {
-        editorSettingsService?.fetchSettings({ [weak self] (hasChanges, settings) in
-            guard hasChanges, let `self` = self else { return }
-            self.gutenberg.updateEditorSettings(settings)
+        editorSettingsService?.fetchSettings({ [weak self] result in
+            guard let `self` = self else { return }
+            switch result {
+            case .success(let response):
+                if response.hasChanges {
+                    self.gutenberg.updateEditorSettings(response.blockEditorSettings)
+                }
+            case .failure(let err):
+                DDLogError("Error fetching settings: \(err)")
+            }
         })
     }
 }
diff --git a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
index 7403b91d611e..0baf3dbd8dde 100644
--- a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
+++ b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift
@@ -21,7 +21,6 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         context = contextManager.mainContext
         mockRemoteApi = MockWordPressComRestApi()
         blog = BlogBuilder(context)
-            .with(wordPressVersion: "5.9")
             .with(isHostedAtWPCom: true)
             .build()
 
@@ -34,9 +33,14 @@ class BlockEditorSettingsServiceTests: XCTestCase {
     func testThemeSupportsNewTheme() {
         let mockedResponse = mockedData(withFilename: twentytwentyoneResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertTrue(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertTrue(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
 
@@ -53,9 +57,14 @@ class BlockEditorSettingsServiceTests: XCTestCase {
 
         let mockedResponse = mockedData(withFilename: twentytwentyoneResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertTrue(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertTrue(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
 
@@ -72,9 +81,14 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         let mockedResponse = mockedData(withFilename: twentytwentyoneResponseFilename)
 
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertFalse(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertFalse(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
         mockRemoteApi.successBlockPassedIn!(mockedResponse, HTTPURLResponse())
@@ -97,11 +111,17 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertTrue(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertTrue(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
+
         mockRemoteApi.successBlockPassedIn!(mockedResponse, HTTPURLResponse())
 
         waitForExpectations(timeout: expectationTimeout)
@@ -113,9 +133,14 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsThemeJSONResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertTrue(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertTrue(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
 
@@ -133,9 +158,14 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsThemeJSONResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertTrue(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertTrue(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
 
@@ -155,9 +185,14 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsThemeJSONResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertTrue(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertTrue(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
 
@@ -177,9 +212,14 @@ class BlockEditorSettingsServiceTests: XCTestCase {
 
         let mockedResponse = mockedData(withFilename: blockSettingsThemeJSONResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
-            XCTAssertFalse(hasChanges)
-            XCTAssertNotNil(result)
+        service.fetchSettings { result in
+            switch result {
+            case .success(let settings):
+                XCTAssertFalse(settings.hasChanges)
+                XCTAssertNotNil(settings.blockEditorSettings)
+            case .failure:
+                XCTFail()
+            }
             waitExpectation.fulfill()
         }
 
@@ -191,11 +231,8 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         XCTAssertEqual(self.blog.blockEditorSettings?.checksum, originalChecksum)
     }
 
-    func testFetchBlockEditorSettings_Org5_8Site() {
-        blog = BlogBuilder(context)
-            .with(wordPressVersion: "5.8")
-            .withAnAccount()
-            .build()
+    func testFetchBlockEditorSettings_OrgSite_NoPlugin() {
+        blog = BlogBuilder(context).build()
 
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
@@ -203,7 +240,7 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         service = BlockEditorSettingsService(blog: blog, remoteAPI: mockOrgRemoteApi, context: context)
 
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
+        service.fetchSettings { _ in
             waitExpectation.fulfill()
         }
 
@@ -214,15 +251,12 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         waitForExpectations(timeout: expectationTimeout)
 
         XCTAssertTrue(mockOrgRemoteApi.getMethodCalled)
-        XCTAssertEqual(mockOrgRemoteApi.URLStringPassedIn!, "/__experimental/wp-block-editor/v1/settings")
-        XCTAssertEqual((mockOrgRemoteApi.parametersPassedIn as! [String: String])["context"], "mobile")
+        XCTAssertEqual(mockOrgRemoteApi.URLStringPassedIn!, "/wp/v2/themes")
+        XCTAssertEqual((mockOrgRemoteApi.parametersPassedIn as! [String: String])["status"], "active")
     }
 
-    func testFetchBlockEditorSettings_Org5_9Site() {
-        blog = BlogBuilder(context)
-            .with(wordPressVersion: "5.9")
-            .with(isHostedAtWPCom: false)
-            .build()
+    func testFetchBlockEditorSettings_OrgSite() {
+        blog = BlogBuilder(context).build()
 
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
@@ -230,7 +264,7 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         service = BlockEditorSettingsService(blog: blog, remoteAPI: mockOrgRemoteApi, context: context)
 
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
+        service.fetchSettings { _ in
             waitExpectation.fulfill()
         }
         mockOrgRemoteApi.completionPassedIn!(.success(mockedResponse), HTTPURLResponse())
@@ -243,8 +277,7 @@ class BlockEditorSettingsServiceTests: XCTestCase {
 
     func testFetchBlockEditorSettings_Com5_8Site() {
         blog = BlogBuilder(context)
-            .with(wordPressVersion: "5.8")
-            .with(isHostedAtWPCom: true)
+            .withAnAccount()
             .build()
 
         service = BlockEditorSettingsService(blog: blog, remoteAPI: mockRemoteApi, context: context)
@@ -252,7 +285,7 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
+        service.fetchSettings { _ in
             waitExpectation.fulfill()
         }
         mockRemoteApi.successBlockPassedIn!(mockedResponse, HTTPURLResponse())
@@ -267,7 +300,7 @@ class BlockEditorSettingsServiceTests: XCTestCase {
         try! FeatureFlagOverrideStore().override(FeatureFlag.globalStyleSettings, withValue: true)
         let mockedResponse = mockedData(withFilename: blockSettingsNOTThemeJSONResponseFilename)
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
-        service.fetchSettings { (hasChanges, result) in
+        service.fetchSettings { _ in
             waitExpectation.fulfill()
         }
         mockRemoteApi.successBlockPassedIn!(mockedResponse, HTTPURLResponse())
@@ -305,7 +338,7 @@ extension BlockEditorSettingsServiceTests {
     func setData(withFilename filename: String) {
         let waitExpectation = expectation(description: "Theme should be successfully fetched")
         let mockedResponse = mockedData(withFilename: filename)
-        service.fetchSettings { (hasChanges, result) in
+        service.fetchSettings { _ in
             waitExpectation.fulfill()
         }
         mockRemoteApi.successBlockPassedIn!(mockedResponse, HTTPURLResponse())

From 049ab2676dff47f9e5c515e07ae99a28ec55679a Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Thu, 8 Jul 2021 18:14:27 -0400
Subject: [PATCH 05/11] Pass the Gallery v2 Flag over from the editor

---
 Podfile                                       |   6 +-
 Podfile.lock                                  | 193 +++++++++---------
 ...torSettingElement+CoreDataProperties.swift |  20 +-
 ...itorSettings+GutenbergEditorSettings.swift |  23 +++
 WordPress/WordPress.xcodeproj/project.pbxproj |  20 +-
 5 files changed, 150 insertions(+), 112 deletions(-)

diff --git a/Podfile b/Podfile
index edbeab09e212..b3d582b777f0 100644
--- a/Podfile
+++ b/Podfile
@@ -50,7 +50,7 @@ def wordpress_kit
     # pod 'WordPressKit', '~> 4.37.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
-    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'cc6836fc78cadae5f825e674292fe8b87998a850'
+    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '1f1b500f554fbe7ced728b55f49e4f26de27a3c2'
     # pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
 
@@ -166,7 +166,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :tag => 'v1.57.0-alpha1'
+    gutenberg :commit => '27b315d5e14754b645f9cbc2ad4430c8307ee396'
 
     ## Third party libraries
     ## =====================
@@ -195,7 +195,7 @@ abstract_target 'Apps' do
 
     # Production
 
-    pod 'Automattic-Tracks-iOS', '~> 0.9.0'
+    pod 'Automattic-Tracks-iOS', '~> 0.9.1'
     # While in PR
     # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => ''
     # Local Development
diff --git a/Podfile.lock b/Podfile.lock
index e980865aa257..733fdb9e0092 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -21,7 +21,7 @@ PODS:
     - AppCenter/Core
   - AppCenter/Distribute (4.1.1):
     - AppCenter/Core
-  - Automattic-Tracks-iOS (0.9.0):
+  - Automattic-Tracks-iOS (0.9.1):
     - CocoaLumberjack (~> 3)
     - Reachability (~> 3)
     - Sentry (~> 6)
@@ -453,6 +453,7 @@ PODS:
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
   - WordPressKit (4.37.0-beta.6):
+  - WordPressKit (4.37.0-beta.5):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -489,19 +490,19 @@ DEPENDENCIES:
   - AMScrollingNavbar (= 5.6.0)
   - AppCenter (= 4.1.1)
   - AppCenter/Distribute (= 4.1.1)
-  - Automattic-Tracks-iOS (~> 0.9.0)
-  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/BVLinearGradient.podspec.json`)
+  - Automattic-Tracks-iOS (~> 0.9.1)
+  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/BVLinearGradient.podspec.json`)
   - Charts (~> 3.2.2)
   - CocoaLumberjack (~> 3.0)
   - CropViewController (= 2.5.3)
   - Down (~> 0.6.6)
-  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/FBLazyVector.podspec.json`)
-  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
+  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBLazyVector.podspec.json`)
+  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
   - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
   - Gifu (= 3.2.0)
-  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/glog.podspec.json`)
+  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/glog.podspec.json`)
   - Gridicons (~> 1.1.0)
-  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.57.0-alpha1`)
+  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `27b315d5e14754b645f9cbc2ad4430c8307ee396`)
   - JTAppleCalendar (~> 8.0.2)
   - Kanvas (~> 1.2.7)
   - MediaEditor (~> 1.2.1)
@@ -511,54 +512,54 @@ DEPENDENCIES:
   - "NSURL+IDN (~> 0.4)"
   - OCMock (~> 3.4.3)
   - OHHTTPStubs/Swift (~> 9.1.0)
-  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RCT-Folly.podspec.json`)
-  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RCTRequired.podspec.json`)
-  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RCTTypeSafety.podspec.json`)
+  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCT-Folly.podspec.json`)
+  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTRequired.podspec.json`)
+  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTTypeSafety.podspec.json`)
   - Reachability (= 3.2)
-  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React.podspec.json`)
-  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-callinvoker.podspec.json`)
-  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-Core.podspec.json`)
-  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-CoreModules.podspec.json`)
-  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-cxxreact.podspec.json`)
-  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-jsi.podspec.json`)
-  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-jsiexecutor.podspec.json`)
-  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-jsinspector.podspec.json`)
-  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-blur.podspec.json`)
-  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-get-random-values.podspec.json`)
-  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
-  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-safe-area.podspec.json`)
-  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-safe-area-context.podspec.json`)
-  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-slider.podspec.json`)
-  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-video.podspec.json`)
-  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-perflogger.podspec.json`)
-  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTActionSheet.podspec.json`)
-  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTAnimation.podspec.json`)
-  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTBlob.podspec.json`)
-  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTImage.podspec.json`)
-  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTLinking.podspec.json`)
-  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTNetwork.podspec.json`)
-  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTSettings.podspec.json`)
-  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTText.podspec.json`)
-  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTVibration.podspec.json`)
-  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-runtimeexecutor.podspec.json`)
-  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/ReactCommon.podspec.json`)
-  - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/ReactNativeDarkMode.podspec.json`)
-  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNCMaskedView.podspec.json`)
-  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNGestureHandler.podspec.json`)
-  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNReanimated.podspec.json`)
-  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNScreens.podspec.json`)
-  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNSVG.podspec.json`)
-  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.57.0-alpha1`)
+  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React.podspec.json`)
+  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-callinvoker.podspec.json`)
+  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-Core.podspec.json`)
+  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-CoreModules.podspec.json`)
+  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-cxxreact.podspec.json`)
+  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsi.podspec.json`)
+  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsiexecutor.podspec.json`)
+  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsinspector.podspec.json`)
+  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-blur.podspec.json`)
+  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-get-random-values.podspec.json`)
+  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
+  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area.podspec.json`)
+  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area-context.podspec.json`)
+  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-slider.podspec.json`)
+  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-video.podspec.json`)
+  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-perflogger.podspec.json`)
+  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTActionSheet.podspec.json`)
+  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTAnimation.podspec.json`)
+  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTBlob.podspec.json`)
+  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTImage.podspec.json`)
+  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTLinking.podspec.json`)
+  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTNetwork.podspec.json`)
+  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTSettings.podspec.json`)
+  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTText.podspec.json`)
+  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTVibration.podspec.json`)
+  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-runtimeexecutor.podspec.json`)
+  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactCommon.podspec.json`)
+  - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactNativeDarkMode.podspec.json`)
+  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNCMaskedView.podspec.json`)
+  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNGestureHandler.podspec.json`)
+  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNReanimated.podspec.json`)
+  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNScreens.podspec.json`)
+  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNSVG.podspec.json`)
+  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `27b315d5e14754b645f9cbc2ad4430c8307ee396`)
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
   - WordPressAuthenticator (~> 1.39.0)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `cc6836fc78cadae5f825e674292fe8b87998a850`)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `1f1b500f554fbe7ced728b55f49e4f26de27a3c2`)
   - WordPressMocks (~> 0.0.13)
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1)
   - WPMediaPicker (~> 1.7.2)
-  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/Yoga.podspec.json`)
+  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
@@ -620,116 +621,116 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   BVLinearGradient:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/BVLinearGradient.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/BVLinearGradient.podspec.json
   FBLazyVector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/FBLazyVector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBLazyVector.podspec.json
   FBReactNativeSpec:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   glog:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/glog.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/glog.podspec.json
   Gutenberg:
+    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
-    :tag: v1.57.0-alpha1
   RCT-Folly:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RCT-Folly.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCT-Folly.podspec.json
   RCTRequired:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RCTRequired.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTRequired.podspec.json
   RCTTypeSafety:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RCTTypeSafety.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTTypeSafety.podspec.json
   React:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React.podspec.json
   React-callinvoker:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-callinvoker.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-callinvoker.podspec.json
   React-Core:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-Core.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-Core.podspec.json
   React-CoreModules:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-CoreModules.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-CoreModules.podspec.json
   React-cxxreact:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-cxxreact.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-cxxreact.podspec.json
   React-jsi:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-jsi.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsi.podspec.json
   React-jsiexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-jsiexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsiexecutor.podspec.json
   React-jsinspector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-jsinspector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsinspector.podspec.json
   react-native-blur:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-blur.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-blur.podspec.json
   react-native-get-random-values:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-get-random-values.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-get-random-values.podspec.json
   react-native-keyboard-aware-scroll-view:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
   react-native-safe-area:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-safe-area.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area.podspec.json
   react-native-safe-area-context:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-safe-area-context.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area-context.podspec.json
   react-native-slider:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-slider.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-slider.podspec.json
   react-native-video:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/react-native-video.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-video.podspec.json
   React-perflogger:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-perflogger.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-perflogger.podspec.json
   React-RCTActionSheet:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTActionSheet.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTActionSheet.podspec.json
   React-RCTAnimation:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTAnimation.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTAnimation.podspec.json
   React-RCTBlob:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTBlob.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTBlob.podspec.json
   React-RCTImage:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTImage.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTImage.podspec.json
   React-RCTLinking:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTLinking.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTLinking.podspec.json
   React-RCTNetwork:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTNetwork.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTNetwork.podspec.json
   React-RCTSettings:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTSettings.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTSettings.podspec.json
   React-RCTText:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTText.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTText.podspec.json
   React-RCTVibration:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-RCTVibration.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTVibration.podspec.json
   React-runtimeexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/React-runtimeexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-runtimeexecutor.podspec.json
   ReactCommon:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/ReactCommon.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactCommon.podspec.json
   ReactNativeDarkMode:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/ReactNativeDarkMode.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactNativeDarkMode.podspec.json
   RNCMaskedView:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNCMaskedView.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNCMaskedView.podspec.json
   RNGestureHandler:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNGestureHandler.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNGestureHandler.podspec.json
   RNReanimated:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNReanimated.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNReanimated.podspec.json
   RNScreens:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNScreens.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNScreens.podspec.json
   RNSVG:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/RNSVG.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNSVG.podspec.json
   RNTAztecView:
+    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
-    :tag: v1.57.0-alpha1
   WordPressKit:
-    :commit: cc6836fc78cadae5f825e674292fe8b87998a850
+    :commit: 1f1b500f554fbe7ced728b55f49e4f26de27a3c2
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.57.0-alpha1/third-party-podspecs/Yoga.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/Yoga.podspec.json
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   Gutenberg:
+    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
-    :tag: v1.57.0-alpha1
   RNTAztecView:
+    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
-    :tag: v1.57.0-alpha1
   WordPressKit:
-    :commit: cc6836fc78cadae5f825e674292fe8b87998a850
+    :commit: 1f1b500f554fbe7ced728b55f49e4f26de27a3c2
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
@@ -740,7 +741,7 @@ SPEC CHECKSUMS:
   AMScrollingNavbar: cf0ec5a5ee659d76ba2509f630bf14fba7e16dc3
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
   AppCenter: cd53e3ed3563cc720bcb806c9731a12389b40d44
-  Automattic-Tracks-iOS: f6ece12d2e630b55b701bac8bcf4301fcce9a327
+  Automattic-Tracks-iOS: f5a6188ad8d00680748111466beabb0aea11f856
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: eee4f8a06f66d85cc3f3288760ac28407ac7f46b
   Charts: f69cf0518b6d1d62608ca504248f1bbe0b6ae77e
@@ -815,7 +816,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82
   WordPress-Editor-iOS: 068b32d02870464ff3cb9e3172e74234e13ed88c
   WordPressAuthenticator: c50b9737d6f459b1010bd07daa9885d19505c504
-  WordPressKit: b91ed01a13f63e9ec824a93290fadf2f0d86bc28
+  WordPressKit: f06ce830dc49081269f928980678b2b2b24f1ea7
   WordPressMocks: dfac50a938ac74dddf5f7cce5a9110126408dd19
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: 7cd64cfaf76ce0cfd78d6a544702c4c774a29919
@@ -831,6 +832,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 94622776e32c0cb8ec2ec0a81ee078bed4f76bc0
+PODFILE CHECKSUM: 9c8a90921730085cb84f977c4f2ee93a2cd61f70
 
 COCOAPODS: 1.10.1
diff --git a/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift b/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift
index a5a93fd4a2c6..3eb66edb8267 100644
--- a/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift
+++ b/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift
@@ -4,12 +4,17 @@ import CoreData
 enum BlockEditorSettingElementTypes: String {
     case color
     case gradient
+    case experimentalFeatures
 
     var valueKey: String {
         self.rawValue
     }
 }
 
+enum BlockEditorExperimentalFeatureKeys: String {
+    case galleryRefactor
+}
+
 extension BlockEditorSettingElement {
 
     @nonobjc public class func fetchRequest() -> NSFetchRequest<BlockEditorSettingElement> {
@@ -53,12 +58,21 @@ extension BlockEditorSettingElement: Identifiable {
     }
 
     convenience init(fromRawRepresentation rawObject: [String: String], type: BlockEditorSettingElementTypes, order: Int, context: NSManagedObjectContext) {
+        self.init(name: rawObject[ #keyPath(BlockEditorSettingElement.name)],
+                  value: rawObject[type.valueKey],
+                  slug: rawObject[#keyPath(BlockEditorSettingElement.slug)],
+                  type: type,
+                  order: order,
+                  context: context)
+    }
+
+    convenience init(name: String?, value: String?, slug: String?, type: BlockEditorSettingElementTypes, order: Int, context: NSManagedObjectContext) {
         self.init(context: context)
 
         self.type = type.rawValue
-        self.value = rawObject[type.valueKey] ?? ""
-        self.slug = rawObject[#keyPath(BlockEditorSettingElement.slug)] ?? ""
-        self.name = rawObject[ #keyPath(BlockEditorSettingElement.name)] ?? ""
+        self.value = value ?? ""
+        self.slug = slug ?? ""
+        self.name = name ?? ""
         self.order = order
     }
 }
diff --git a/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift b/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift
index 8fbc10e0077d..e86aec7082dc 100644
--- a/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift
+++ b/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift
@@ -11,6 +11,10 @@ extension BlockEditorSettings: GutenbergEditorSettings {
         elementsByType(.gradient)
     }
 
+    public var galleryRefactor: Bool {
+        return experimentalFeature(.galleryRefactor)
+    }
+
     private func elementsByType(_ type: BlockEditorSettingElementTypes) -> [[String: String]]? {
         return elements?.sorted(by: { (lhs, rhs) -> Bool in
             return lhs.order >= rhs.order
@@ -19,6 +23,15 @@ extension BlockEditorSettings: GutenbergEditorSettings {
             return element.rawRepresentation
         })
     }
+
+    private func experimentalFeature(_ feature: BlockEditorExperimentalFeatureKeys) -> Bool {
+        guard let experimentalFeature = elements?.first(where: { (element) -> Bool in
+            guard element.type == BlockEditorSettingElementTypes.experimentalFeatures.rawValue else { return false }
+            return element.slug == feature.rawValue
+        }) else { return false }
+
+        return Bool(experimentalFeature.value) ?? false
+    }
 }
 
 extension BlockEditorSettings {
@@ -60,6 +73,16 @@ extension BlockEditorSettings {
             parsedElements.insert(BlockEditorSettingElement(fromRawRepresentation: gradient, type: .gradient, order: index, context: context))
         })
 
+        // Experimental Features
+        let galleryKey = BlockEditorExperimentalFeatureKeys.galleryRefactor.rawValue
+        let galleryRefactor = BlockEditorSettingElement(name: galleryKey,
+                                                         value: "\(remoteSettings.galleryRefactor)",
+                                                         slug: galleryKey,
+                                                         type: .experimentalFeatures,
+                                                         order: 0,
+                                                         context: context)
+        parsedElements.insert(galleryRefactor)
+
         self.elements = parsedElements
     }
 }
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index 0a0312274557..102e39b64648 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -358,7 +358,7 @@
 		24B1AE3124FEC79900B9F334 /* RemoteFeatureFlagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B1AE3024FEC79900B9F334 /* RemoteFeatureFlagTests.swift */; };
 		24C69A8B2612421900312D9A /* UserSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24C69A8A2612421900312D9A /* UserSettingsTests.swift */; };
 		24C69AC22612467C00312D9A /* UserSettingsTestsObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 24C69AC12612467C00312D9A /* UserSettingsTestsObjc.m */; };
-		24CE2EB1258D687A0000C297 /* WordPressFlux in Frameworks */ = {isa = PBXBuildFile; productRef = 24CE2EB0258D687A0000C297 /* WordPressFlux */; };
+		24CE2EB1258D687A0000C297 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 24CE2EB0258D687A0000C297 /* SwiftPackageProductDependency */; };
 		24F3789825E6E62100A27BB7 /* NSManagedObject+Lookup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F3789725E6E62100A27BB7 /* NSManagedObject+Lookup.swift */; };
 		2611CC62A62F9E6BC25350FE /* Pods_WordPressScreenshotGeneration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB390AA9C94F16E78184E9D1 /* Pods_WordPressScreenshotGeneration.framework */; };
 		26D66DEC36ACF7442186B07D /* Pods_WordPressThisWeekWidget.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 979B445A45E13F3289F2E99E /* Pods_WordPressThisWeekWidget.framework */; };
@@ -4200,7 +4200,7 @@
 		FABB26322602FC2C00C8785C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 296890770FE971DC00770264 /* Security.framework */; };
 		FABB26332602FC2C00C8785C /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83F3E25F11275E07004CD686 /* MapKit.framework */; };
 		FABB26342602FC2C00C8785C /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83F3E2D211276371004CD686 /* CoreLocation.framework */; };
-		FABB26352602FC2C00C8785C /* WordPressFlux in Frameworks */ = {isa = PBXBuildFile; productRef = FABB1FA62602FC2C00C8785C /* WordPressFlux */; };
+		FABB26352602FC2C00C8785C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = FABB1FA62602FC2C00C8785C /* SwiftPackageProductDependency */; };
 		FABB26362602FC2C00C8785C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8355D7D811D260AA00A61362 /* CoreData.framework */; };
 		FABB26372602FC2C00C8785C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 834CE7331256D0DE0046A4A3 /* CFNetwork.framework */; };
 		FABB26382602FC2C00C8785C /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83043E54126FA31400EC9953 /* MessageUI.framework */; };
@@ -7536,7 +7536,7 @@
 				296890780FE971DC00770264 /* Security.framework in Frameworks */,
 				83F3E26011275E07004CD686 /* MapKit.framework in Frameworks */,
 				83F3E2D311276371004CD686 /* CoreLocation.framework in Frameworks */,
-				24CE2EB1258D687A0000C297 /* WordPressFlux in Frameworks */,
+				24CE2EB1258D687A0000C297 /* BuildFile in Frameworks */,
 				8355D7D911D260AA00A61362 /* CoreData.framework in Frameworks */,
 				834CE7341256D0DE0046A4A3 /* CFNetwork.framework in Frameworks */,
 				83043E55126FA31400EC9953 /* MessageUI.framework in Frameworks */,
@@ -7680,7 +7680,7 @@
 				FABB26322602FC2C00C8785C /* Security.framework in Frameworks */,
 				FABB26332602FC2C00C8785C /* MapKit.framework in Frameworks */,
 				FABB26342602FC2C00C8785C /* CoreLocation.framework in Frameworks */,
-				FABB26352602FC2C00C8785C /* WordPressFlux in Frameworks */,
+				FABB26352602FC2C00C8785C /* BuildFile in Frameworks */,
 				FABB26362602FC2C00C8785C /* CoreData.framework in Frameworks */,
 				FABB26372602FC2C00C8785C /* CFNetwork.framework in Frameworks */,
 				FABB26382602FC2C00C8785C /* MessageUI.framework in Frameworks */,
@@ -8332,7 +8332,7 @@
 			path = Classes;
 			sourceTree = "<group>";
 		};
-		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
+		29B97314FDCFA39411CA2CEA = {
 			isa = PBXGroup;
 			children = (
 				F14B5F6F208E648200439554 /* config */,
@@ -14375,7 +14375,7 @@
 			);
 			name = WordPress;
 			packageProductDependencies = (
-				24CE2EB0258D687A0000C297 /* WordPressFlux */,
+				24CE2EB0258D687A0000C297 /* SwiftPackageProductDependency */,
 			);
 			productName = WordPress;
 			productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */;
@@ -14631,7 +14631,7 @@
 			);
 			name = Jetpack;
 			packageProductDependencies = (
-				FABB1FA62602FC2C00C8785C /* WordPressFlux */,
+				FABB1FA62602FC2C00C8785C /* SwiftPackageProductDependency */,
 			);
 			productName = WordPress;
 			productReference = FABB26522602FC2C00C8785C /* Jetpack.app */;
@@ -14866,7 +14866,7 @@
 				bg,
 				sk,
 			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
+			mainGroup = 29B97314FDCFA39411CA2CEA;
 			productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -24586,11 +24586,11 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		24CE2EB0258D687A0000C297 /* WordPressFlux */ = {
+		24CE2EB0258D687A0000C297 /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = WordPressFlux;
 		};
-		FABB1FA62602FC2C00C8785C /* WordPressFlux */ = {
+		FABB1FA62602FC2C00C8785C /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = WordPressFlux;
 		};

From df7f892b162f328281656afdbd5cb5221e277287 Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Mon, 12 Jul 2021 12:46:55 -0400
Subject: [PATCH 06/11] Update Pod spec

---
 Podfile      |   6 +-
 Podfile.lock | 193 +++++++++++++++++++++++++--------------------------
 2 files changed, 99 insertions(+), 100 deletions(-)

diff --git a/Podfile b/Podfile
index b3d582b777f0..f71a5d05c319 100644
--- a/Podfile
+++ b/Podfile
@@ -50,7 +50,7 @@ def wordpress_kit
     # pod 'WordPressKit', '~> 4.37.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
-    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '1f1b500f554fbe7ced728b55f49e4f26de27a3c2'
+    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'bd0da2a4d94528193fad152717d908b85efa2db7'
     # pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
 
@@ -166,7 +166,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :commit => '27b315d5e14754b645f9cbc2ad4430c8307ee396'
+    gutenberg :commit => '6bf4531d056ea279962ffa0d79d499229467f10a'
 
     ## Third party libraries
     ## =====================
@@ -195,7 +195,7 @@ abstract_target 'Apps' do
 
     # Production
 
-    pod 'Automattic-Tracks-iOS', '~> 0.9.1'
+    pod 'Automattic-Tracks-iOS', '~> 0.9.0'
     # While in PR
     # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => ''
     # Local Development
diff --git a/Podfile.lock b/Podfile.lock
index 733fdb9e0092..32365695739a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -21,7 +21,7 @@ PODS:
     - AppCenter/Core
   - AppCenter/Distribute (4.1.1):
     - AppCenter/Core
-  - Automattic-Tracks-iOS (0.9.1):
+  - Automattic-Tracks-iOS (0.9.0):
     - CocoaLumberjack (~> 3)
     - Reachability (~> 3)
     - Sentry (~> 6)
@@ -453,7 +453,6 @@ PODS:
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
   - WordPressKit (4.37.0-beta.6):
-  - WordPressKit (4.37.0-beta.5):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -490,19 +489,19 @@ DEPENDENCIES:
   - AMScrollingNavbar (= 5.6.0)
   - AppCenter (= 4.1.1)
   - AppCenter/Distribute (= 4.1.1)
-  - Automattic-Tracks-iOS (~> 0.9.1)
-  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/BVLinearGradient.podspec.json`)
+  - Automattic-Tracks-iOS (~> 0.9.0)
+  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/BVLinearGradient.podspec.json`)
   - Charts (~> 3.2.2)
   - CocoaLumberjack (~> 3.0)
   - CropViewController (= 2.5.3)
   - Down (~> 0.6.6)
-  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBLazyVector.podspec.json`)
-  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
+  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/FBLazyVector.podspec.json`)
+  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
   - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
   - Gifu (= 3.2.0)
-  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/glog.podspec.json`)
+  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/glog.podspec.json`)
   - Gridicons (~> 1.1.0)
-  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `27b315d5e14754b645f9cbc2ad4430c8307ee396`)
+  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `6bf4531d056ea279962ffa0d79d499229467f10a`)
   - JTAppleCalendar (~> 8.0.2)
   - Kanvas (~> 1.2.7)
   - MediaEditor (~> 1.2.1)
@@ -512,54 +511,54 @@ DEPENDENCIES:
   - "NSURL+IDN (~> 0.4)"
   - OCMock (~> 3.4.3)
   - OHHTTPStubs/Swift (~> 9.1.0)
-  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCT-Folly.podspec.json`)
-  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTRequired.podspec.json`)
-  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTTypeSafety.podspec.json`)
+  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RCT-Folly.podspec.json`)
+  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RCTRequired.podspec.json`)
+  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RCTTypeSafety.podspec.json`)
   - Reachability (= 3.2)
-  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React.podspec.json`)
-  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-callinvoker.podspec.json`)
-  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-Core.podspec.json`)
-  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-CoreModules.podspec.json`)
-  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-cxxreact.podspec.json`)
-  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsi.podspec.json`)
-  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsiexecutor.podspec.json`)
-  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsinspector.podspec.json`)
-  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-blur.podspec.json`)
-  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-get-random-values.podspec.json`)
-  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
-  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area.podspec.json`)
-  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area-context.podspec.json`)
-  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-slider.podspec.json`)
-  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-video.podspec.json`)
-  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-perflogger.podspec.json`)
-  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTActionSheet.podspec.json`)
-  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTAnimation.podspec.json`)
-  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTBlob.podspec.json`)
-  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTImage.podspec.json`)
-  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTLinking.podspec.json`)
-  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTNetwork.podspec.json`)
-  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTSettings.podspec.json`)
-  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTText.podspec.json`)
-  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTVibration.podspec.json`)
-  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-runtimeexecutor.podspec.json`)
-  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactCommon.podspec.json`)
-  - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactNativeDarkMode.podspec.json`)
-  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNCMaskedView.podspec.json`)
-  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNGestureHandler.podspec.json`)
-  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNReanimated.podspec.json`)
-  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNScreens.podspec.json`)
-  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNSVG.podspec.json`)
-  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `27b315d5e14754b645f9cbc2ad4430c8307ee396`)
+  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React.podspec.json`)
+  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-callinvoker.podspec.json`)
+  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-Core.podspec.json`)
+  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-CoreModules.podspec.json`)
+  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-cxxreact.podspec.json`)
+  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-jsi.podspec.json`)
+  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-jsiexecutor.podspec.json`)
+  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-jsinspector.podspec.json`)
+  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-blur.podspec.json`)
+  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-get-random-values.podspec.json`)
+  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
+  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-safe-area.podspec.json`)
+  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-safe-area-context.podspec.json`)
+  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-slider.podspec.json`)
+  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-video.podspec.json`)
+  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-perflogger.podspec.json`)
+  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTActionSheet.podspec.json`)
+  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTAnimation.podspec.json`)
+  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTBlob.podspec.json`)
+  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTImage.podspec.json`)
+  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTLinking.podspec.json`)
+  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTNetwork.podspec.json`)
+  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTSettings.podspec.json`)
+  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTText.podspec.json`)
+  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTVibration.podspec.json`)
+  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-runtimeexecutor.podspec.json`)
+  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/ReactCommon.podspec.json`)
+  - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/ReactNativeDarkMode.podspec.json`)
+  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNCMaskedView.podspec.json`)
+  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNGestureHandler.podspec.json`)
+  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNReanimated.podspec.json`)
+  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNScreens.podspec.json`)
+  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNSVG.podspec.json`)
+  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `6bf4531d056ea279962ffa0d79d499229467f10a`)
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
   - WordPressAuthenticator (~> 1.39.0)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `1f1b500f554fbe7ced728b55f49e4f26de27a3c2`)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `bd0da2a4d94528193fad152717d908b85efa2db7`)
   - WordPressMocks (~> 0.0.13)
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1)
   - WPMediaPicker (~> 1.7.2)
-  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/Yoga.podspec.json`)
+  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
@@ -621,116 +620,116 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   BVLinearGradient:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/BVLinearGradient.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/BVLinearGradient.podspec.json
   FBLazyVector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBLazyVector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/FBLazyVector.podspec.json
   FBReactNativeSpec:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   glog:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/glog.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/glog.podspec.json
   Gutenberg:
-    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
+    :commit: 6bf4531d056ea279962ffa0d79d499229467f10a
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   RCT-Folly:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCT-Folly.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RCT-Folly.podspec.json
   RCTRequired:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTRequired.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RCTRequired.podspec.json
   RCTTypeSafety:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RCTTypeSafety.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RCTTypeSafety.podspec.json
   React:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React.podspec.json
   React-callinvoker:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-callinvoker.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-callinvoker.podspec.json
   React-Core:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-Core.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-Core.podspec.json
   React-CoreModules:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-CoreModules.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-CoreModules.podspec.json
   React-cxxreact:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-cxxreact.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-cxxreact.podspec.json
   React-jsi:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsi.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-jsi.podspec.json
   React-jsiexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsiexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-jsiexecutor.podspec.json
   React-jsinspector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-jsinspector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-jsinspector.podspec.json
   react-native-blur:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-blur.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-blur.podspec.json
   react-native-get-random-values:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-get-random-values.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-get-random-values.podspec.json
   react-native-keyboard-aware-scroll-view:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
   react-native-safe-area:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-safe-area.podspec.json
   react-native-safe-area-context:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-safe-area-context.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-safe-area-context.podspec.json
   react-native-slider:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-slider.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-slider.podspec.json
   react-native-video:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/react-native-video.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/react-native-video.podspec.json
   React-perflogger:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-perflogger.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-perflogger.podspec.json
   React-RCTActionSheet:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTActionSheet.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTActionSheet.podspec.json
   React-RCTAnimation:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTAnimation.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTAnimation.podspec.json
   React-RCTBlob:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTBlob.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTBlob.podspec.json
   React-RCTImage:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTImage.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTImage.podspec.json
   React-RCTLinking:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTLinking.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTLinking.podspec.json
   React-RCTNetwork:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTNetwork.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTNetwork.podspec.json
   React-RCTSettings:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTSettings.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTSettings.podspec.json
   React-RCTText:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTText.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTText.podspec.json
   React-RCTVibration:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-RCTVibration.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-RCTVibration.podspec.json
   React-runtimeexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/React-runtimeexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/React-runtimeexecutor.podspec.json
   ReactCommon:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactCommon.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/ReactCommon.podspec.json
   ReactNativeDarkMode:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/ReactNativeDarkMode.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/ReactNativeDarkMode.podspec.json
   RNCMaskedView:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNCMaskedView.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNCMaskedView.podspec.json
   RNGestureHandler:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNGestureHandler.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNGestureHandler.podspec.json
   RNReanimated:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNReanimated.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNReanimated.podspec.json
   RNScreens:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNScreens.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNScreens.podspec.json
   RNSVG:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/RNSVG.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/RNSVG.podspec.json
   RNTAztecView:
-    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
+    :commit: 6bf4531d056ea279962ffa0d79d499229467f10a
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   WordPressKit:
-    :commit: 1f1b500f554fbe7ced728b55f49e4f26de27a3c2
+    :commit: bd0da2a4d94528193fad152717d908b85efa2db7
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/27b315d5e14754b645f9cbc2ad4430c8307ee396/third-party-podspecs/Yoga.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/6bf4531d056ea279962ffa0d79d499229467f10a/third-party-podspecs/Yoga.podspec.json
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   Gutenberg:
-    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
+    :commit: 6bf4531d056ea279962ffa0d79d499229467f10a
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   RNTAztecView:
-    :commit: 27b315d5e14754b645f9cbc2ad4430c8307ee396
+    :commit: 6bf4531d056ea279962ffa0d79d499229467f10a
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   WordPressKit:
-    :commit: 1f1b500f554fbe7ced728b55f49e4f26de27a3c2
+    :commit: bd0da2a4d94528193fad152717d908b85efa2db7
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
@@ -741,7 +740,7 @@ SPEC CHECKSUMS:
   AMScrollingNavbar: cf0ec5a5ee659d76ba2509f630bf14fba7e16dc3
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
   AppCenter: cd53e3ed3563cc720bcb806c9731a12389b40d44
-  Automattic-Tracks-iOS: f5a6188ad8d00680748111466beabb0aea11f856
+  Automattic-Tracks-iOS: f6ece12d2e630b55b701bac8bcf4301fcce9a327
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: eee4f8a06f66d85cc3f3288760ac28407ac7f46b
   Charts: f69cf0518b6d1d62608ca504248f1bbe0b6ae77e
@@ -816,7 +815,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82
   WordPress-Editor-iOS: 068b32d02870464ff3cb9e3172e74234e13ed88c
   WordPressAuthenticator: c50b9737d6f459b1010bd07daa9885d19505c504
-  WordPressKit: f06ce830dc49081269f928980678b2b2b24f1ea7
+  WordPressKit: b91ed01a13f63e9ec824a93290fadf2f0d86bc28
   WordPressMocks: dfac50a938ac74dddf5f7cce5a9110126408dd19
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: 7cd64cfaf76ce0cfd78d6a544702c4c774a29919
@@ -832,6 +831,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 9c8a90921730085cb84f977c4f2ee93a2cd61f70
+PODFILE CHECKSUM: f9e8a266a7f889f4ee61db0d754bcf817e130764
 
 COCOAPODS: 1.10.1

From 42b6e70cb57e0b5d7d6726352a55d7e198a6842c Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Mon, 2 Aug 2021 15:50:50 -0400
Subject: [PATCH 07/11] Update keys with new naming scheme for Gallery Refactor

---
 .../BlockEditorSettingElement+CoreDataProperties.swift    | 2 +-
 .../BlockEditorSettings+GutenbergEditorSettings.swift     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift b/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift
index 3eb66edb8267..4f64aad59613 100644
--- a/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift
+++ b/WordPress/Classes/Models/BlockEditorSettingElement+CoreDataProperties.swift
@@ -12,7 +12,7 @@ enum BlockEditorSettingElementTypes: String {
 }
 
 enum BlockEditorExperimentalFeatureKeys: String {
-    case galleryRefactor
+    case galleryWithImageBlocks
 }
 
 extension BlockEditorSettingElement {
diff --git a/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift b/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift
index e86aec7082dc..b85d59d77926 100644
--- a/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift
+++ b/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift
@@ -11,8 +11,8 @@ extension BlockEditorSettings: GutenbergEditorSettings {
         elementsByType(.gradient)
     }
 
-    public var galleryRefactor: Bool {
-        return experimentalFeature(.galleryRefactor)
+    public var galleryWithImageBlocks: Bool {
+        return experimentalFeature(.galleryWithImageBlocks)
     }
 
     private func elementsByType(_ type: BlockEditorSettingElementTypes) -> [[String: String]]? {
@@ -74,9 +74,9 @@ extension BlockEditorSettings {
         })
 
         // Experimental Features
-        let galleryKey = BlockEditorExperimentalFeatureKeys.galleryRefactor.rawValue
+        let galleryKey = BlockEditorExperimentalFeatureKeys.galleryWithImageBlocks.rawValue
         let galleryRefactor = BlockEditorSettingElement(name: galleryKey,
-                                                         value: "\(remoteSettings.galleryRefactor)",
+                                                         value: "\(remoteSettings.galleryWithImageBlocks)",
                                                          slug: galleryKey,
                                                          type: .experimentalFeatures,
                                                          order: 0,

From 89d9d3c03cac6d6cb8c1fab27c2c6b8e5c766f52 Mon Sep 17 00:00:00 2001
From: Chip Snyder <chip.snyder3@gmail.com>
Date: Mon, 2 Aug 2021 16:18:08 -0400
Subject: [PATCH 08/11] Update Gutenberg Mobile

---
 Podfile      |   2 +-
 Podfile.lock | 230 +++++++++++++++++++++++++--------------------------
 2 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/Podfile b/Podfile
index 3612751d1068..508b513fa129 100644
--- a/Podfile
+++ b/Podfile
@@ -165,7 +165,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :commit => '122d03e8946362e34ffcda0b20513dbda302b7f2'
+    gutenberg :commit => 'fc430696f1638717b84f5832ab0ea4e07dad224f'
 
     ## Third party libraries
     ## =====================
diff --git a/Podfile.lock b/Podfile.lock
index 46a2c83c2937..c9a3677835b6 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -28,7 +28,7 @@ PODS:
     - Sodium (>= 0.9.1)
     - UIDeviceIdentifier (~> 1)
   - boost-for-react-native (1.63.0)
-  - BVLinearGradient (2.5.6):
+  - BVLinearGradient (2.5.6-wp):
     - React-Core
   - Charts (3.2.2):
     - Charts/Core (= 3.2.2)
@@ -62,7 +62,7 @@ PODS:
     - AppAuth/Core (~> 1.4)
     - GTMSessionFetcher/Core (~> 1.5)
   - GTMSessionFetcher/Core (1.6.1)
-  - Gutenberg (1.56.0):
+  - Gutenberg (1.58.1):
     - React (= 0.64.0)
     - React-CoreModules (= 0.64.0)
     - React-RCTImage (= 0.64.0)
@@ -313,20 +313,20 @@ PODS:
   - React-jsinspector (0.64.0)
   - react-native-blur (3.6.1):
     - React-Core
-  - react-native-get-random-values (1.4.0):
+  - react-native-get-random-values (1.4.0-wp):
     - React-Core
-  - react-native-keyboard-aware-scroll-view (0.8.8):
+  - react-native-keyboard-aware-scroll-view (0.8.8-wp):
     - React-Core
   - react-native-safe-area (0.5.1):
     - React-Core
-  - react-native-safe-area-context (3.2.0):
+  - react-native-safe-area-context (3.2.0-wp):
     - React-Core
-  - react-native-slider (3.0.2):
+  - react-native-slider (3.0.2-wp):
     - React-Core
-  - react-native-video (5.0.2):
+  - react-native-video (5.0.2-wp):
     - React-Core
-    - react-native-video/Video (= 5.0.2)
-  - react-native-video/Video (5.0.2):
+    - react-native-video/Video (= 5.0.2-wp)
+  - react-native-video/Video (5.0.2-wp):
     - React-Core
   - React-perflogger (0.64.0)
   - React-RCTActionSheet (0.64.0):
@@ -415,17 +415,17 @@ PODS:
     - React-jsi (= 0.64.0)
     - React-perflogger (= 0.64.0)
     - ReactCommon/turbomodule/core (= 0.64.0)
-  - RNCMaskedView (0.1.10-wp):
+  - RNCMaskedView (0.1.11-wp):
     - React-Core
-  - RNGestureHandler (1.10.1):
+  - RNGestureHandler (1.10.1-wp):
     - React-Core
-  - RNReanimated (1.9.0):
+  - RNReanimated (1.9.0-wp):
     - React-Core
-  - RNScreens (2.9.0):
+  - RNScreens (2.9.0-wp):
     - React-Core
-  - RNSVG (9.13.6-gb):
+  - RNSVG (9.13.7-wp):
     - React-Core
-  - RNTAztecView (1.56.0):
+  - RNTAztecView (1.58.1):
     - React-Core
     - WordPress-Aztec-iOS (~> 1.19.4)
   - Sentry (6.2.1):
@@ -488,18 +488,18 @@ DEPENDENCIES:
   - AppCenter (~> 4.1)
   - AppCenter/Distribute (~> 4.1)
   - Automattic-Tracks-iOS (~> 0.9.1)
-  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/BVLinearGradient.podspec.json`)
+  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/BVLinearGradient.podspec.json`)
   - Charts (~> 3.2.2)
   - CocoaLumberjack (~> 3.0)
   - CropViewController (= 2.5.3)
   - Down (~> 0.6.6)
-  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/FBLazyVector.podspec.json`)
-  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
+  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/FBLazyVector.podspec.json`)
+  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
   - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
   - Gifu (= 3.2.0)
-  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/glog.podspec.json`)
+  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/glog.podspec.json`)
   - Gridicons (~> 1.1.0)
-  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `122d03e8946362e34ffcda0b20513dbda302b7f2`)
+  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `fc430696f1638717b84f5832ab0ea4e07dad224f`)
   - JTAppleCalendar (~> 8.0.2)
   - Kanvas (~> 1.2.7)
   - MediaEditor (~> 1.2.1)
@@ -509,43 +509,43 @@ DEPENDENCIES:
   - "NSURL+IDN (~> 0.4)"
   - OCMock (~> 3.4.3)
   - OHHTTPStubs/Swift (~> 9.1.0)
-  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RCT-Folly.podspec.json`)
-  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RCTRequired.podspec.json`)
-  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RCTTypeSafety.podspec.json`)
+  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RCT-Folly.podspec.json`)
+  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RCTRequired.podspec.json`)
+  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RCTTypeSafety.podspec.json`)
   - Reachability (= 3.2)
-  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React.podspec.json`)
-  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-callinvoker.podspec.json`)
-  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-Core.podspec.json`)
-  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-CoreModules.podspec.json`)
-  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-cxxreact.podspec.json`)
-  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-jsi.podspec.json`)
-  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-jsiexecutor.podspec.json`)
-  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-jsinspector.podspec.json`)
-  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-blur.podspec.json`)
-  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-get-random-values.podspec.json`)
-  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
-  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-safe-area.podspec.json`)
-  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-safe-area-context.podspec.json`)
-  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-slider.podspec.json`)
-  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-video.podspec.json`)
-  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-perflogger.podspec.json`)
-  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTActionSheet.podspec.json`)
-  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTAnimation.podspec.json`)
-  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTBlob.podspec.json`)
-  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTImage.podspec.json`)
-  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTLinking.podspec.json`)
-  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTNetwork.podspec.json`)
-  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTSettings.podspec.json`)
-  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTText.podspec.json`)
-  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTVibration.podspec.json`)
-  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-runtimeexecutor.podspec.json`)
-  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/ReactCommon.podspec.json`)
-  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNCMaskedView.podspec.json`)
-  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNGestureHandler.podspec.json`)
-  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNReanimated.podspec.json`)
-  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNScreens.podspec.json`)
-  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNSVG.podspec.json`)
-  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `122d03e8946362e34ffcda0b20513dbda302b7f2`)
+  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React.podspec.json`)
+  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-callinvoker.podspec.json`)
+  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-Core.podspec.json`)
+  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-CoreModules.podspec.json`)
+  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-cxxreact.podspec.json`)
+  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-jsi.podspec.json`)
+  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-jsiexecutor.podspec.json`)
+  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-jsinspector.podspec.json`)
+  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-blur.podspec.json`)
+  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-get-random-values.podspec.json`)
+  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
+  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-safe-area.podspec.json`)
+  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-safe-area-context.podspec.json`)
+  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-slider.podspec.json`)
+  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-video.podspec.json`)
+  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-perflogger.podspec.json`)
+  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTActionSheet.podspec.json`)
+  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTAnimation.podspec.json`)
+  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTBlob.podspec.json`)
+  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTImage.podspec.json`)
+  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTLinking.podspec.json`)
+  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTNetwork.podspec.json`)
+  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTSettings.podspec.json`)
+  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTText.podspec.json`)
+  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTVibration.podspec.json`)
+  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-runtimeexecutor.podspec.json`)
+  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/ReactCommon.podspec.json`)
+  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNCMaskedView.podspec.json`)
+  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNGestureHandler.podspec.json`)
+  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNReanimated.podspec.json`)
+  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNScreens.podspec.json`)
+  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNSVG.podspec.json`)
+  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `fc430696f1638717b84f5832ab0ea4e07dad224f`)
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
@@ -555,7 +555,7 @@ DEPENDENCIES:
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1)
   - WPMediaPicker (~> 1.7.2)
-  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/Yoga.podspec.json`)
+  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
@@ -617,110 +617,110 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   BVLinearGradient:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/BVLinearGradient.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/BVLinearGradient.podspec.json
   FBLazyVector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/FBLazyVector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/FBLazyVector.podspec.json
   FBReactNativeSpec:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   glog:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/glog.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/glog.podspec.json
   Gutenberg:
-    :commit: 122d03e8946362e34ffcda0b20513dbda302b7f2
+    :commit: fc430696f1638717b84f5832ab0ea4e07dad224f
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   RCT-Folly:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RCT-Folly.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RCT-Folly.podspec.json
   RCTRequired:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RCTRequired.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RCTRequired.podspec.json
   RCTTypeSafety:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RCTTypeSafety.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RCTTypeSafety.podspec.json
   React:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React.podspec.json
   React-callinvoker:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-callinvoker.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-callinvoker.podspec.json
   React-Core:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-Core.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-Core.podspec.json
   React-CoreModules:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-CoreModules.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-CoreModules.podspec.json
   React-cxxreact:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-cxxreact.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-cxxreact.podspec.json
   React-jsi:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-jsi.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-jsi.podspec.json
   React-jsiexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-jsiexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-jsiexecutor.podspec.json
   React-jsinspector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-jsinspector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-jsinspector.podspec.json
   react-native-blur:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-blur.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-blur.podspec.json
   react-native-get-random-values:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-get-random-values.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-get-random-values.podspec.json
   react-native-keyboard-aware-scroll-view:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
   react-native-safe-area:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-safe-area.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-safe-area.podspec.json
   react-native-safe-area-context:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-safe-area-context.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-safe-area-context.podspec.json
   react-native-slider:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-slider.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-slider.podspec.json
   react-native-video:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/react-native-video.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/react-native-video.podspec.json
   React-perflogger:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-perflogger.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-perflogger.podspec.json
   React-RCTActionSheet:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTActionSheet.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTActionSheet.podspec.json
   React-RCTAnimation:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTAnimation.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTAnimation.podspec.json
   React-RCTBlob:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTBlob.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTBlob.podspec.json
   React-RCTImage:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTImage.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTImage.podspec.json
   React-RCTLinking:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTLinking.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTLinking.podspec.json
   React-RCTNetwork:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTNetwork.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTNetwork.podspec.json
   React-RCTSettings:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTSettings.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTSettings.podspec.json
   React-RCTText:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTText.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTText.podspec.json
   React-RCTVibration:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-RCTVibration.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-RCTVibration.podspec.json
   React-runtimeexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/React-runtimeexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/React-runtimeexecutor.podspec.json
   ReactCommon:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/ReactCommon.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/ReactCommon.podspec.json
   RNCMaskedView:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNCMaskedView.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNCMaskedView.podspec.json
   RNGestureHandler:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNGestureHandler.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNGestureHandler.podspec.json
   RNReanimated:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNReanimated.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNReanimated.podspec.json
   RNScreens:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNScreens.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNScreens.podspec.json
   RNSVG:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/RNSVG.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/RNSVG.podspec.json
   RNTAztecView:
-    :commit: 122d03e8946362e34ffcda0b20513dbda302b7f2
+    :commit: fc430696f1638717b84f5832ab0ea4e07dad224f
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   WordPressKit:
     :branch: rnmobile/refactor/gallery-as-nested-image-blocks-editor-settings_v2
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/122d03e8946362e34ffcda0b20513dbda302b7f2/third-party-podspecs/Yoga.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/fc430696f1638717b84f5832ab0ea4e07dad224f/third-party-podspecs/Yoga.podspec.json
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   Gutenberg:
-    :commit: 122d03e8946362e34ffcda0b20513dbda302b7f2
+    :commit: fc430696f1638717b84f5832ab0ea4e07dad224f
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   RNTAztecView:
-    :commit: 122d03e8946362e34ffcda0b20513dbda302b7f2
+    :commit: fc430696f1638717b84f5832ab0ea4e07dad224f
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   WordPressKit:
@@ -737,7 +737,7 @@ SPEC CHECKSUMS:
   AppCenter: 87ef6eefd8ade4df59e88951288587429f3dd2a5
   Automattic-Tracks-iOS: f5a6188ad8d00680748111466beabb0aea11f856
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  BVLinearGradient: eee4f8a06f66d85cc3f3288760ac28407ac7f46b
+  BVLinearGradient: e7305369025cbdb0172ecf9751e2075bd472004d
   Charts: f69cf0518b6d1d62608ca504248f1bbe0b6ae77e
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
@@ -753,7 +753,7 @@ SPEC CHECKSUMS:
   Gridicons: 17d660b97ce4231d582101b02f8280628b141c9a
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
   GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
-  Gutenberg: 9b5a207bc0040c49c47c0e890d713c8ce37ca78b
+  Gutenberg: a47fb1d57ec9f88caddd79f78e65dd73978a5eb8
   JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99
   Kanvas: 9eab00cc89669b38858d42d5f30c810876b31344
   lottie-ios: 3a3758ef5a008e762faec9c9d50a39842f26d124
@@ -777,12 +777,12 @@ SPEC CHECKSUMS:
   React-jsiexecutor: ca987eb608fdaad2a5bec9beb4f61436cbbd2299
   React-jsinspector: dce15903df657a565e1f753e20b0864ceab7a181
   react-native-blur: 7f21bce1eeae924f28a4cefc7b23ce035c015ea5
-  react-native-get-random-values: 9c625d343481d0d4553b8e11a7edaf8995be3a07
-  react-native-keyboard-aware-scroll-view: a7d3f19afe82242a839de99c0245b654758f644a
+  react-native-get-random-values: b441122f57ce07abacef889e87e77768fe5c9360
+  react-native-keyboard-aware-scroll-view: 70e9aee078c494fba15d91b576bfbbd53639caca
   react-native-safe-area: e3de9e959c7baaae8db9bcb015d99ed1da25c9d5
-  react-native-safe-area-context: 1e501ec30c260422def56e95e11edb103caa5bf2
-  react-native-slider: 7c3e22b6612b0443224d543dffac1a0f238da2a6
-  react-native-video: 76654aa0de8bd57a6d6a647b631e438d5d6da692
+  react-native-safe-area-context: ba2b2ec84d7a532d19c6b86f0deb2fd6d8a28362
+  react-native-slider: 5ae4a65e7a80d5f0048cbb07944de6470b4a101b
+  react-native-video: 79b566a04ba3e90f2d21b2a7deb27b47b0123aa3
   React-perflogger: 1b191be4af85b046824841466b530926af106423
   React-RCTActionSheet: 6381fffb79f8574784be60e06b8a196ea31b694d
   React-RCTAnimation: 342a55b7d70b9f70dc3fa7cf9dcf0c2638c58cf4
@@ -795,12 +795,12 @@ SPEC CHECKSUMS:
   React-RCTVibration: 464cbf174f0c11d4853401fefe2627a3e648714d
   React-runtimeexecutor: 86375fe8e12dd6927345c677081b512d603d8adc
   ReactCommon: 05f421bbdca720b5706a988729512f0a482140eb
-  RNCMaskedView: 3d849f89313f2f21fb8b35d901c1082b8da187db
-  RNGestureHandler: 87fb38122c34468820465b20c32bc5fe4d1f147c
-  RNReanimated: 5d94111694aeadd5668f967873f7289a06fde289
-  RNScreens: bd1f43d7dfcd435bc11d4ee5c60086717c45a113
-  RNSVG: 0df105803980a68d31e3537e22bf19b372d9abee
-  RNTAztecView: 58f5ea815b4c7f0d7a1cd0cd2104461dd5919122
+  RNCMaskedView: e001674a509c52d3cfb7c5a0a2ca6f5d85d752d8
+  RNGestureHandler: aaadb03e3637b3e7faf1f52d4872ffe32e613357
+  RNReanimated: af718db8a69c9df3138aa6bb66ed48519fbf0afe
+  RNScreens: 05c9398ab729aeaa010872cee9b0162876dffc31
+  RNSVG: 4752b984c26b5397dd5cf1ca25c9c0015c9f7cce
+  RNTAztecView: 4df0b979749f0ae6a0952e786809d258d77c1deb
   Sentry: 9b922b396b0e0bca8516a10e36b0ea3ebea5faf7
   Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da
   Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
@@ -825,6 +825,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: da8443668d1af0521369d21a4f3f090eddf89d0a
+PODFILE CHECKSUM: 03a9a62cf8a01eb4b54b654c4e90dad9cb1bb5c9
 
 COCOAPODS: 1.10.1

From c5cfebd783d7a2b52de2c662960df1022dbd6ad5 Mon Sep 17 00:00:00 2001
From: Chip <chip.snyder@automattic.com>
Date: Wed, 4 Aug 2021 11:29:17 -0400
Subject: [PATCH 09/11] [Gallery Refactor] Analytics (#16848)

* Add Gallery flag to editor session start

* Update analytic key names for gallery refactor
---
 .../Gutenberg/GutenbergViewController.swift         |  4 +++-
 .../Post/PostEditorAnalyticsSession.swift           | 13 ++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
index 8fbb17ce07fb..a0704c11350c 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
@@ -894,11 +894,13 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
 
     func gutenbergDidMount(unsupportedBlockNames: [String]) {
         if !editorSession.started {
+            let galleryWithImageBlocks = gutenbergEditorSettings()?.galleryWithImageBlocks
+
             // Note that this method is also used to track startup performance
             // It assumes this is being called when the editor has finished loading
             // If you need to refactor this, please ensure that the startup_time_ms property
             // is still reflecting the actual startup time of the editor
-            editorSession.start(unsupportedBlocks: unsupportedBlockNames, canViewEditorOnboarding: canViewEditorOnboarding())
+            editorSession.start(unsupportedBlocks: unsupportedBlockNames, canViewEditorOnboarding: canViewEditorOnboarding(), galleryWithImageBlocks: galleryWithImageBlocks)
         }
     }
 
diff --git a/WordPress/Classes/ViewRelated/Post/PostEditorAnalyticsSession.swift b/WordPress/Classes/ViewRelated/Post/PostEditorAnalyticsSession.swift
index e102bccabe9d..953ca70a5a9b 100644
--- a/WordPress/Classes/ViewRelated/Post/PostEditorAnalyticsSession.swift
+++ b/WordPress/Classes/ViewRelated/Post/PostEditorAnalyticsSession.swift
@@ -18,17 +18,17 @@ struct PostEditorAnalyticsSession {
         contentType = ContentType(post: post).rawValue
     }
 
-    mutating func start(unsupportedBlocks: [String] = [], canViewEditorOnboarding: Bool = false) {
+    mutating func start(unsupportedBlocks: [String] = [], canViewEditorOnboarding: Bool = false, galleryWithImageBlocks: Bool? = nil) {
         assert(!started, "An editor session was attempted to start more than once")
         hasUnsupportedBlocks = !unsupportedBlocks.isEmpty
 
-        let properties = startEventProperties(with: unsupportedBlocks, canViewEditorOnboarding: canViewEditorOnboarding)
+        let properties = startEventProperties(with: unsupportedBlocks, canViewEditorOnboarding: canViewEditorOnboarding, galleryWithImageBlocks: galleryWithImageBlocks)
 
         WPAppAnalytics.track(.editorSessionStart, withProperties: properties)
         started = true
     }
 
-    private func startEventProperties(with unsupportedBlocks: [String], canViewEditorOnboarding: Bool) -> [String: Any] {
+    private func startEventProperties(with unsupportedBlocks: [String], canViewEditorOnboarding: Bool, galleryWithImageBlocks: Bool?) -> [String: Any] {
         // On Android, we are tracking this in milliseconds, which seems like a good enough time scale
         // Let's make sure to round the value and send an integer for consistency
         let startupTimeNanoseconds = DispatchTime.now().uptimeNanoseconds - startTime
@@ -43,6 +43,12 @@ struct PostEditorAnalyticsSession {
 
         properties[Property.canViewEditorOnboarding] = canViewEditorOnboarding
 
+        if let galleryWithImageBlocks = galleryWithImageBlocks {
+            properties[Property.unstableGalleryWithImageBlocks] = "\(galleryWithImageBlocks)"
+        } else {
+            properties[Property.unstableGalleryWithImageBlocks] = "unknown"
+        }
+
         return properties.merging(commonProperties, uniquingKeysWith: { $1 })
     }
 
@@ -87,6 +93,7 @@ private extension PostEditorAnalyticsSession {
         static let template = "template"
         static let startupTime = "startup_time_ms"
         static let canViewEditorOnboarding = "can_view_editor_onboarding"
+        static let unstableGalleryWithImageBlocks = "unstableGalleryWithImageBlocks"
     }
 
     var commonProperties: [String: String] {

From 6856e4578e613114929b5db3b7afc0e8c37d465a Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@automattic.com>
Date: Wed, 1 Sep 2021 20:25:10 +0300
Subject: [PATCH 10/11] Updates Gutenberg reference

---
 Podfile      |   2 +-
 Podfile.lock | 178 +++++++++++++++++++++++++--------------------------
 2 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/Podfile b/Podfile
index aca24c26951e..943e25244315 100644
--- a/Podfile
+++ b/Podfile
@@ -166,7 +166,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :commit => 'bab8f5cc312bd3e8574322a12c16fdff54217d4e'
+    gutenberg :commit => 'f05560d4382b4cb8ae842889929dc615a5589d43'
     # gutenberg :tag => 'v1.60.1'
 
     ## Third party libraries
diff --git a/Podfile.lock b/Podfile.lock
index ee4e316ca4d8..710bd0a91990 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -490,18 +490,18 @@ DEPENDENCIES:
   - AppCenter (~> 4.1)
   - AppCenter/Distribute (~> 4.1)
   - Automattic-Tracks-iOS (~> 0.9.1)
-  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/BVLinearGradient.podspec.json`)
+  - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/BVLinearGradient.podspec.json`)
   - Charts (~> 3.2.2)
   - CocoaLumberjack (~> 3.0)
   - CropViewController (= 2.5.3)
   - Down (~> 0.6.6)
-  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/FBLazyVector.podspec.json`)
-  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
+  - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/FBLazyVector.podspec.json`)
+  - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`)
   - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
   - Gifu (= 3.2.0)
-  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/glog.podspec.json`)
+  - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/glog.podspec.json`)
   - Gridicons (~> 1.1.0)
-  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `bab8f5cc312bd3e8574322a12c16fdff54217d4e`)
+  - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `f05560d4382b4cb8ae842889929dc615a5589d43`)
   - JTAppleCalendar (~> 8.0.2)
   - Kanvas (~> 1.2.7)
   - MediaEditor (~> 1.2.1)
@@ -511,44 +511,44 @@ DEPENDENCIES:
   - "NSURL+IDN (~> 0.4)"
   - OCMock (~> 3.4.3)
   - OHHTTPStubs/Swift (~> 9.1.0)
-  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RCT-Folly.podspec.json`)
-  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RCTRequired.podspec.json`)
-  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RCTTypeSafety.podspec.json`)
+  - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RCT-Folly.podspec.json`)
+  - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RCTRequired.podspec.json`)
+  - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RCTTypeSafety.podspec.json`)
   - Reachability (= 3.2)
-  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React.podspec.json`)
-  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-callinvoker.podspec.json`)
-  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-Core.podspec.json`)
-  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-CoreModules.podspec.json`)
-  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-cxxreact.podspec.json`)
-  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-jsi.podspec.json`)
-  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-jsiexecutor.podspec.json`)
-  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-jsinspector.podspec.json`)
-  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-blur.podspec.json`)
-  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-get-random-values.podspec.json`)
-  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
-  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-safe-area.podspec.json`)
-  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-safe-area-context.podspec.json`)
-  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-slider.podspec.json`)
-  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-video.podspec.json`)
-  - react-native-webview (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-webview.podspec.json`)
-  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-perflogger.podspec.json`)
-  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTActionSheet.podspec.json`)
-  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTAnimation.podspec.json`)
-  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTBlob.podspec.json`)
-  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTImage.podspec.json`)
-  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTLinking.podspec.json`)
-  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTNetwork.podspec.json`)
-  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTSettings.podspec.json`)
-  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTText.podspec.json`)
-  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTVibration.podspec.json`)
-  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-runtimeexecutor.podspec.json`)
-  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/ReactCommon.podspec.json`)
-  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNCMaskedView.podspec.json`)
-  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNGestureHandler.podspec.json`)
-  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNReanimated.podspec.json`)
-  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNScreens.podspec.json`)
-  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNSVG.podspec.json`)
-  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `bab8f5cc312bd3e8574322a12c16fdff54217d4e`)
+  - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React.podspec.json`)
+  - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-callinvoker.podspec.json`)
+  - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-Core.podspec.json`)
+  - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-CoreModules.podspec.json`)
+  - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-cxxreact.podspec.json`)
+  - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-jsi.podspec.json`)
+  - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-jsiexecutor.podspec.json`)
+  - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-jsinspector.podspec.json`)
+  - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-blur.podspec.json`)
+  - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-get-random-values.podspec.json`)
+  - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`)
+  - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-safe-area.podspec.json`)
+  - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-safe-area-context.podspec.json`)
+  - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-slider.podspec.json`)
+  - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-video.podspec.json`)
+  - react-native-webview (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-webview.podspec.json`)
+  - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-perflogger.podspec.json`)
+  - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTActionSheet.podspec.json`)
+  - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTAnimation.podspec.json`)
+  - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTBlob.podspec.json`)
+  - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTImage.podspec.json`)
+  - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTLinking.podspec.json`)
+  - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTNetwork.podspec.json`)
+  - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTSettings.podspec.json`)
+  - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTText.podspec.json`)
+  - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTVibration.podspec.json`)
+  - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-runtimeexecutor.podspec.json`)
+  - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/ReactCommon.podspec.json`)
+  - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNCMaskedView.podspec.json`)
+  - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNGestureHandler.podspec.json`)
+  - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNReanimated.podspec.json`)
+  - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNScreens.podspec.json`)
+  - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNSVG.podspec.json`)
+  - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `f05560d4382b4cb8ae842889929dc615a5589d43`)
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
@@ -558,7 +558,7 @@ DEPENDENCIES:
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1)
   - WPMediaPicker (~> 1.7.2)
-  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/Yoga.podspec.json`)
+  - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
@@ -620,112 +620,112 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   BVLinearGradient:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/BVLinearGradient.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/BVLinearGradient.podspec.json
   FBLazyVector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/FBLazyVector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/FBLazyVector.podspec.json
   FBReactNativeSpec:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   glog:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/glog.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/glog.podspec.json
   Gutenberg:
-    :commit: bab8f5cc312bd3e8574322a12c16fdff54217d4e
+    :commit: f05560d4382b4cb8ae842889929dc615a5589d43
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   RCT-Folly:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RCT-Folly.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RCT-Folly.podspec.json
   RCTRequired:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RCTRequired.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RCTRequired.podspec.json
   RCTTypeSafety:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RCTTypeSafety.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RCTTypeSafety.podspec.json
   React:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React.podspec.json
   React-callinvoker:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-callinvoker.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-callinvoker.podspec.json
   React-Core:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-Core.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-Core.podspec.json
   React-CoreModules:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-CoreModules.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-CoreModules.podspec.json
   React-cxxreact:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-cxxreact.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-cxxreact.podspec.json
   React-jsi:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-jsi.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-jsi.podspec.json
   React-jsiexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-jsiexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-jsiexecutor.podspec.json
   React-jsinspector:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-jsinspector.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-jsinspector.podspec.json
   react-native-blur:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-blur.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-blur.podspec.json
   react-native-get-random-values:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-get-random-values.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-get-random-values.podspec.json
   react-native-keyboard-aware-scroll-view:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json
   react-native-safe-area:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-safe-area.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-safe-area.podspec.json
   react-native-safe-area-context:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-safe-area-context.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-safe-area-context.podspec.json
   react-native-slider:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-slider.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-slider.podspec.json
   react-native-video:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-video.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-video.podspec.json
   react-native-webview:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/react-native-webview.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/react-native-webview.podspec.json
   React-perflogger:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-perflogger.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-perflogger.podspec.json
   React-RCTActionSheet:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTActionSheet.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTActionSheet.podspec.json
   React-RCTAnimation:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTAnimation.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTAnimation.podspec.json
   React-RCTBlob:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTBlob.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTBlob.podspec.json
   React-RCTImage:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTImage.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTImage.podspec.json
   React-RCTLinking:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTLinking.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTLinking.podspec.json
   React-RCTNetwork:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTNetwork.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTNetwork.podspec.json
   React-RCTSettings:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTSettings.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTSettings.podspec.json
   React-RCTText:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTText.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTText.podspec.json
   React-RCTVibration:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-RCTVibration.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-RCTVibration.podspec.json
   React-runtimeexecutor:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/React-runtimeexecutor.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/React-runtimeexecutor.podspec.json
   ReactCommon:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/ReactCommon.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/ReactCommon.podspec.json
   RNCMaskedView:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNCMaskedView.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNCMaskedView.podspec.json
   RNGestureHandler:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNGestureHandler.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNGestureHandler.podspec.json
   RNReanimated:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNReanimated.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNReanimated.podspec.json
   RNScreens:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNScreens.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNScreens.podspec.json
   RNSVG:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/RNSVG.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/RNSVG.podspec.json
   RNTAztecView:
-    :commit: bab8f5cc312bd3e8574322a12c16fdff54217d4e
+    :commit: f05560d4382b4cb8ae842889929dc615a5589d43
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   WordPressKit:
     :branch: rnmobile/refactor/gallery-as-nested-image-blocks-editor-settings_v2
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
-    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bab8f5cc312bd3e8574322a12c16fdff54217d4e/third-party-podspecs/Yoga.podspec.json
+    :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/f05560d4382b4cb8ae842889929dc615a5589d43/third-party-podspecs/Yoga.podspec.json
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   Gutenberg:
-    :commit: bab8f5cc312bd3e8574322a12c16fdff54217d4e
+    :commit: f05560d4382b4cb8ae842889929dc615a5589d43
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   RNTAztecView:
-    :commit: bab8f5cc312bd3e8574322a12c16fdff54217d4e
+    :commit: f05560d4382b4cb8ae842889929dc615a5589d43
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
   WordPressKit:
@@ -831,6 +831,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: 05bc2aec4d728c29d06d9beece2b56051f27c485
+PODFILE CHECKSUM: 26ec730a184a6c4a1a053cefa41bb978fd3dc701
 
 COCOAPODS: 1.10.1

From 35156a320a9fa574939a5d7447a7fde30293d292 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@automattic.com>
Date: Thu, 2 Sep 2021 13:37:50 +0300
Subject: [PATCH 11/11] Reverse config change

---
 .bundle/config | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.bundle/config b/.bundle/config
index 395b3edaa503..da970cb8c12e 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -1,5 +1,3 @@
 ---
 BUNDLE_PATH: "vendor/bundle"
-BUNDLE_RETRY: "3"
-BUNDLE_JOBS: "3"
 BUNDLE_WITHOUT: "screenshots"