diff --git a/AmplifyPlugins/API/Podfile.lock b/AmplifyPlugins/API/Podfile.lock
index dce8d9ec4e..93f772728b 100644
--- a/AmplifyPlugins/API/Podfile.lock
+++ b/AmplifyPlugins/API/Podfile.lock
@@ -1,41 +1,41 @@
 PODS:
-  - Amplify (1.30.4):
-    - Amplify/Default (= 1.30.4)
-  - Amplify/Default (1.30.4)
-  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.4):
+  - Amplify (1.30.5):
+    - Amplify/Default (= 1.30.5)
+  - Amplify/Default (1.30.5)
+  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.5):
     - AWSAuthCore (~> 2.33.0)
     - AWSCognitoIdentityProvider (~> 2.33.0)
     - AWSCognitoIdentityProviderASF (~> 2.33.0)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
-  - AmplifyTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
-    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
+  - AmplifyTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
+    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
+  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AppSyncRealTimeClient (3.1.0):
-    - Starscream (~> 4.0.4)
-  - AWSAuthCore (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProvider (2.33.0):
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProviderASF (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCore (2.33.0)
-  - AWSMobileClient (2.33.0):
-    - AWSAuthCore (= 2.33.0)
-    - AWSCognitoIdentityProvider (= 2.33.0)
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSPluginsCore (1.30.4):
-    - Amplify (= 1.30.4)
+  - AppSyncRealTimeClient (3.1.2):
+    - Starscream (= 4.0.4)
+  - AWSAuthCore (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProvider (2.33.5):
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProviderASF (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCore (2.33.5)
+  - AWSMobileClient (2.33.5):
+    - AWSAuthCore (= 2.33.5)
+    - AWSCognitoIdentityProvider (= 2.33.5)
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSPluginsCore (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
@@ -96,16 +96,16 @@ CHECKOUT OPTIONS:
     :tag: 2.1.0
 
 SPEC CHECKSUMS:
-  Amplify: 4e41668c8801667e174ab50c12bc3099c71a257f
-  AmplifyPlugins: 1335f0919aa07329df58685a020f2311c75a5176
-  AmplifyTestCommon: fef1ca37417681cc246d0860cd18e4c6723fbbf7
-  AppSyncRealTimeClient: 49901c6f21e541bec09281854c5695a6c1309bf7
-  AWSAuthCore: 544324f7c595cba78440027039c4429e6ce588fa
-  AWSCognitoIdentityProvider: f7364fdae1109e6f326c19e98f5ed5b5d413d929
-  AWSCognitoIdentityProviderASF: 2023303dc28588dfe95a4152e588bcea5e1f57ec
-  AWSCore: ff962198e35c750cb1d59cd459c51f1990e3ec68
-  AWSMobileClient: 9fab7504e6403dda5988471aa82cfd33ef8a8b78
-  AWSPluginsCore: f2188458c27e6cb09597c67876f80611d14275d7
+  Amplify: f29d16cb83721f4a680336506308dc84b4af757e
+  AmplifyPlugins: 7a2376a6eb7f51af3202f83bbaf9d81543dff811
+  AmplifyTestCommon: 2a13eb1404b21401b8c15a2464e6345029de4c02
+  AppSyncRealTimeClient: 36ff2f65f330bce7f1d0d2157a4ae5d255483dac
+  AWSAuthCore: f80d57f22ad0c781082658de8f941393ea21b955
+  AWSCognitoIdentityProvider: 5eeb67304ea7ac853836d685f2b50c08d3194155
+  AWSCognitoIdentityProviderASF: aaa2eb46b9775090081b33fb5134090ba253e889
+  AWSCore: 6d8aa46c210e37f15c10509437a9c8570f7290bd
+  AWSMobileClient: 07c4cf156a1b3715cdf15493cdf11aade97d2369
+  AWSPluginsCore: 2a3b2eabc70f2bec67081a150986b9d3089dbe12
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: a004322095d7101b945442c86adc7cec0650f676
   CwlMachBadInstructionHandler: aa1fe9f2d08b29507c150d099434b2890247e7f8
diff --git a/AmplifyPlugins/Analytics/Podfile.lock b/AmplifyPlugins/Analytics/Podfile.lock
index 160eff1988..6be5aacd2b 100644
--- a/AmplifyPlugins/Analytics/Podfile.lock
+++ b/AmplifyPlugins/Analytics/Podfile.lock
@@ -1,41 +1,41 @@
 PODS:
-  - Amplify (1.30.4):
-    - Amplify/Default (= 1.30.4)
-  - Amplify/Default (1.30.4)
-  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.4):
+  - Amplify (1.30.5):
+    - Amplify/Default (= 1.30.5)
+  - Amplify/Default (1.30.5)
+  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.5):
     - AWSAuthCore (~> 2.33.0)
     - AWSCognitoIdentityProvider (~> 2.33.0)
     - AWSCognitoIdentityProviderASF (~> 2.33.0)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
-  - AmplifyTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
-    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
+  - AmplifyTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
+    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
+  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AWSAuthCore (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProvider (2.33.0):
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProviderASF (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCore (2.33.0)
-  - AWSMobileClient (2.33.0):
-    - AWSAuthCore (= 2.33.0)
-    - AWSCognitoIdentityProvider (= 2.33.0)
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSPinpoint (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSPluginsCore (1.30.4):
-    - Amplify (= 1.30.4)
+  - AWSAuthCore (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProvider (2.33.5):
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProviderASF (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCore (2.33.5)
+  - AWSMobileClient (2.33.5):
+    - AWSAuthCore (= 2.33.5)
+    - AWSCognitoIdentityProvider (= 2.33.5)
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSPinpoint (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSPluginsCore (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
@@ -94,16 +94,16 @@ CHECKOUT OPTIONS:
     :tag: 2.1.0
 
 SPEC CHECKSUMS:
-  Amplify: 4e41668c8801667e174ab50c12bc3099c71a257f
-  AmplifyPlugins: 1335f0919aa07329df58685a020f2311c75a5176
-  AmplifyTestCommon: fef1ca37417681cc246d0860cd18e4c6723fbbf7
-  AWSAuthCore: 544324f7c595cba78440027039c4429e6ce588fa
-  AWSCognitoIdentityProvider: f7364fdae1109e6f326c19e98f5ed5b5d413d929
-  AWSCognitoIdentityProviderASF: 2023303dc28588dfe95a4152e588bcea5e1f57ec
-  AWSCore: ff962198e35c750cb1d59cd459c51f1990e3ec68
-  AWSMobileClient: 9fab7504e6403dda5988471aa82cfd33ef8a8b78
-  AWSPinpoint: bf06c3d6d7d6db904f155a7828bb7aeca8e7fa7c
-  AWSPluginsCore: f2188458c27e6cb09597c67876f80611d14275d7
+  Amplify: f29d16cb83721f4a680336506308dc84b4af757e
+  AmplifyPlugins: 7a2376a6eb7f51af3202f83bbaf9d81543dff811
+  AmplifyTestCommon: 2a13eb1404b21401b8c15a2464e6345029de4c02
+  AWSAuthCore: f80d57f22ad0c781082658de8f941393ea21b955
+  AWSCognitoIdentityProvider: 5eeb67304ea7ac853836d685f2b50c08d3194155
+  AWSCognitoIdentityProviderASF: aaa2eb46b9775090081b33fb5134090ba253e889
+  AWSCore: 6d8aa46c210e37f15c10509437a9c8570f7290bd
+  AWSMobileClient: 07c4cf156a1b3715cdf15493cdf11aade97d2369
+  AWSPinpoint: 86e99df82096f9ee5eca59711f6628abc92aa415
+  AWSPluginsCore: 2a3b2eabc70f2bec67081a150986b9d3089dbe12
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: a004322095d7101b945442c86adc7cec0650f676
   CwlMachBadInstructionHandler: aa1fe9f2d08b29507c150d099434b2890247e7f8
diff --git a/AmplifyPlugins/Auth/Podfile.lock b/AmplifyPlugins/Auth/Podfile.lock
index 7648dce28b..16712818fb 100644
--- a/AmplifyPlugins/Auth/Podfile.lock
+++ b/AmplifyPlugins/Auth/Podfile.lock
@@ -1,32 +1,32 @@
 PODS:
-  - Amplify (1.30.4):
-    - Amplify/Default (= 1.30.4)
-  - Amplify/Default (1.30.4)
-  - AmplifyTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
-    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.4)
+  - Amplify (1.30.5):
+    - Amplify/Default (= 1.30.5)
+  - Amplify/Default (1.30.5)
+  - AmplifyTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
+    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
+  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AWSAuthCore (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProvider (2.33.0):
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProviderASF (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCore (2.33.0)
-  - AWSMobileClient (2.33.0):
-    - AWSAuthCore (= 2.33.0)
-    - AWSCognitoIdentityProvider (= 2.33.0)
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSPluginsCore (1.30.4):
-    - Amplify (= 1.30.4)
+  - AWSAuthCore (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProvider (2.33.5):
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProviderASF (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCore (2.33.5)
+  - AWSMobileClient (2.33.5):
+    - AWSAuthCore (= 2.33.5)
+    - AWSCognitoIdentityProvider (= 2.33.5)
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSPluginsCore (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
@@ -81,14 +81,14 @@ CHECKOUT OPTIONS:
     :tag: 2.1.0
 
 SPEC CHECKSUMS:
-  Amplify: 4e41668c8801667e174ab50c12bc3099c71a257f
-  AmplifyTestCommon: fef1ca37417681cc246d0860cd18e4c6723fbbf7
-  AWSAuthCore: 544324f7c595cba78440027039c4429e6ce588fa
-  AWSCognitoIdentityProvider: f7364fdae1109e6f326c19e98f5ed5b5d413d929
-  AWSCognitoIdentityProviderASF: 2023303dc28588dfe95a4152e588bcea5e1f57ec
-  AWSCore: ff962198e35c750cb1d59cd459c51f1990e3ec68
-  AWSMobileClient: 9fab7504e6403dda5988471aa82cfd33ef8a8b78
-  AWSPluginsCore: f2188458c27e6cb09597c67876f80611d14275d7
+  Amplify: f29d16cb83721f4a680336506308dc84b4af757e
+  AmplifyTestCommon: 2a13eb1404b21401b8c15a2464e6345029de4c02
+  AWSAuthCore: f80d57f22ad0c781082658de8f941393ea21b955
+  AWSCognitoIdentityProvider: 5eeb67304ea7ac853836d685f2b50c08d3194155
+  AWSCognitoIdentityProviderASF: aaa2eb46b9775090081b33fb5134090ba253e889
+  AWSCore: 6d8aa46c210e37f15c10509437a9c8570f7290bd
+  AWSMobileClient: 07c4cf156a1b3715cdf15493cdf11aade97d2369
+  AWSPluginsCore: 2a3b2eabc70f2bec67081a150986b9d3089dbe12
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: a004322095d7101b945442c86adc7cec0650f676
   CwlMachBadInstructionHandler: aa1fe9f2d08b29507c150d099434b2890247e7f8
diff --git a/AmplifyPlugins/DataStore/Podfile.lock b/AmplifyPlugins/DataStore/Podfile.lock
index fb2df83a09..a7f876e58b 100644
--- a/AmplifyPlugins/DataStore/Podfile.lock
+++ b/AmplifyPlugins/DataStore/Podfile.lock
@@ -1,27 +1,27 @@
 PODS:
-  - Amplify (1.30.4):
-    - Amplify/Default (= 1.30.4)
-  - Amplify/Default (1.30.4)
-  - AmplifyPlugins/AWSAPIPlugin (1.30.4):
+  - Amplify (1.30.5):
+    - Amplify/Default (= 1.30.5)
+  - Amplify/Default (1.30.5)
+  - AmplifyPlugins/AWSAPIPlugin (1.30.5):
     - AppSyncRealTimeClient (~> 3.1)
     - AWSCore (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
-  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.4):
+    - AWSPluginsCore (= 1.30.5)
+  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.5):
     - AWSAuthCore (~> 2.33.0)
     - AWSCognitoIdentityProvider (~> 2.33.0)
     - AWSCognitoIdentityProviderASF (~> 2.33.0)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
-  - AmplifyTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
-    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
+  - AmplifyTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
+    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
+  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
   - AppSyncRealTimeClient (3.1.2):
     - Starscream (= 4.0.4)
@@ -38,8 +38,8 @@ PODS:
     - AWSCognitoIdentityProvider (= 2.33.5)
     - AWSCognitoIdentityProviderASF (= 2.33.5)
     - AWSCore (= 2.33.5)
-  - AWSPluginsCore (1.30.4):
-    - Amplify (= 1.30.4)
+  - AWSPluginsCore (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
@@ -106,16 +106,16 @@ CHECKOUT OPTIONS:
     :tag: 2.1.0
 
 SPEC CHECKSUMS:
-  Amplify: 4e41668c8801667e174ab50c12bc3099c71a257f
-  AmplifyPlugins: 1335f0919aa07329df58685a020f2311c75a5176
-  AmplifyTestCommon: fef1ca37417681cc246d0860cd18e4c6723fbbf7
+  Amplify: f29d16cb83721f4a680336506308dc84b4af757e
+  AmplifyPlugins: 7a2376a6eb7f51af3202f83bbaf9d81543dff811
+  AmplifyTestCommon: 2a13eb1404b21401b8c15a2464e6345029de4c02
   AppSyncRealTimeClient: 36ff2f65f330bce7f1d0d2157a4ae5d255483dac
   AWSAuthCore: f80d57f22ad0c781082658de8f941393ea21b955
   AWSCognitoIdentityProvider: 5eeb67304ea7ac853836d685f2b50c08d3194155
   AWSCognitoIdentityProviderASF: aaa2eb46b9775090081b33fb5134090ba253e889
   AWSCore: 6d8aa46c210e37f15c10509437a9c8570f7290bd
   AWSMobileClient: 07c4cf156a1b3715cdf15493cdf11aade97d2369
-  AWSPluginsCore: f2188458c27e6cb09597c67876f80611d14275d7
+  AWSPluginsCore: 2a3b2eabc70f2bec67081a150986b9d3089dbe12
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: a004322095d7101b945442c86adc7cec0650f676
   CwlMachBadInstructionHandler: aa1fe9f2d08b29507c150d099434b2890247e7f8
@@ -128,4 +128,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0bab7193bebdf470839514f327440893b0d26090
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.11.3
diff --git a/AmplifyPlugins/Geo/Podfile.lock b/AmplifyPlugins/Geo/Podfile.lock
index 72b8425030..db1532002d 100644
--- a/AmplifyPlugins/Geo/Podfile.lock
+++ b/AmplifyPlugins/Geo/Podfile.lock
@@ -1,41 +1,41 @@
 PODS:
-  - Amplify (1.30.4):
-    - Amplify/Default (= 1.30.4)
-  - Amplify/Default (1.30.4)
-  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.4):
+  - Amplify (1.30.5):
+    - Amplify/Default (= 1.30.5)
+  - Amplify/Default (1.30.5)
+  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.5):
     - AWSAuthCore (~> 2.33.0)
     - AWSCognitoIdentityProvider (~> 2.33.0)
     - AWSCognitoIdentityProviderASF (~> 2.33.0)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
-  - AmplifyTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
-    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
+  - AmplifyTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
+    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
+  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AWSAuthCore (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProvider (2.33.0):
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProviderASF (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCore (2.33.0)
-  - AWSLocation (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSMobileClient (2.33.0):
-    - AWSAuthCore (= 2.33.0)
-    - AWSCognitoIdentityProvider (= 2.33.0)
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSPluginsCore (1.30.4):
-    - Amplify (= 1.30.4)
+  - AWSAuthCore (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProvider (2.33.5):
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProviderASF (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCore (2.33.5)
+  - AWSLocation (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSMobileClient (2.33.5):
+    - AWSAuthCore (= 2.33.5)
+    - AWSCognitoIdentityProvider (= 2.33.5)
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSPluginsCore (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
@@ -94,16 +94,16 @@ CHECKOUT OPTIONS:
     :tag: 2.1.0
 
 SPEC CHECKSUMS:
-  Amplify: 4e41668c8801667e174ab50c12bc3099c71a257f
-  AmplifyPlugins: 1335f0919aa07329df58685a020f2311c75a5176
-  AmplifyTestCommon: fef1ca37417681cc246d0860cd18e4c6723fbbf7
-  AWSAuthCore: 544324f7c595cba78440027039c4429e6ce588fa
-  AWSCognitoIdentityProvider: f7364fdae1109e6f326c19e98f5ed5b5d413d929
-  AWSCognitoIdentityProviderASF: 2023303dc28588dfe95a4152e588bcea5e1f57ec
-  AWSCore: ff962198e35c750cb1d59cd459c51f1990e3ec68
-  AWSLocation: be834a971f026f719abf474310a3de736c6689bd
-  AWSMobileClient: 9fab7504e6403dda5988471aa82cfd33ef8a8b78
-  AWSPluginsCore: f2188458c27e6cb09597c67876f80611d14275d7
+  Amplify: f29d16cb83721f4a680336506308dc84b4af757e
+  AmplifyPlugins: 7a2376a6eb7f51af3202f83bbaf9d81543dff811
+  AmplifyTestCommon: 2a13eb1404b21401b8c15a2464e6345029de4c02
+  AWSAuthCore: f80d57f22ad0c781082658de8f941393ea21b955
+  AWSCognitoIdentityProvider: 5eeb67304ea7ac853836d685f2b50c08d3194155
+  AWSCognitoIdentityProviderASF: aaa2eb46b9775090081b33fb5134090ba253e889
+  AWSCore: 6d8aa46c210e37f15c10509437a9c8570f7290bd
+  AWSLocation: 321635e0bdad9e494fabd2805b4c6cc36a72f882
+  AWSMobileClient: 07c4cf156a1b3715cdf15493cdf11aade97d2369
+  AWSPluginsCore: 2a3b2eabc70f2bec67081a150986b9d3089dbe12
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: 42bf8c5e4e5e663f51100ddfa68caf7cfcf64ab6
   CwlMachBadInstructionHandler: b982c7e3e44fcfa1c680e8046f6bba35f3476d65
diff --git a/AmplifyPlugins/Predictions/Podfile.lock b/AmplifyPlugins/Predictions/Podfile.lock
index 9806ab086f..219de5629f 100644
--- a/AmplifyPlugins/Predictions/Podfile.lock
+++ b/AmplifyPlugins/Predictions/Podfile.lock
@@ -1,52 +1,52 @@
 PODS:
-  - Amplify (1.30.4):
-    - Amplify/Default (= 1.30.4)
-  - Amplify/Default (1.30.4)
-  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.4):
+  - Amplify (1.30.5):
+    - Amplify/Default (= 1.30.5)
+  - Amplify/Default (1.30.5)
+  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.5):
     - AWSAuthCore (~> 2.33.0)
     - AWSCognitoIdentityProvider (~> 2.33.0)
     - AWSCognitoIdentityProviderASF (~> 2.33.0)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
-  - AmplifyTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
-    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
+  - AmplifyTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
+    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
+  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AWSAuthCore (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProvider (2.33.0):
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProviderASF (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSComprehend (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCore (2.33.0)
-  - AWSMobileClient (2.33.0):
-    - AWSAuthCore (= 2.33.0)
-    - AWSCognitoIdentityProvider (= 2.33.0)
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSPluginsCore (1.30.4):
-    - Amplify (= 1.30.4)
+  - AWSAuthCore (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProvider (2.33.5):
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProviderASF (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSComprehend (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCore (2.33.5)
+  - AWSMobileClient (2.33.5):
+    - AWSAuthCore (= 2.33.5)
+    - AWSCognitoIdentityProvider (= 2.33.5)
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSPluginsCore (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
-  - AWSPolly (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSRekognition (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSTextract (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSTranscribeStreaming (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSTranslate (2.33.0):
-    - AWSCore (= 2.33.0)
+  - AWSPolly (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSRekognition (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSTextract (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSTranscribeStreaming (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSTranslate (2.33.5):
+    - AWSCore (= 2.33.5)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
   - CwlCatchExceptionSupport (2.1.2)
@@ -114,21 +114,21 @@ CHECKOUT OPTIONS:
     :tag: 2.1.0
 
 SPEC CHECKSUMS:
-  Amplify: 4e41668c8801667e174ab50c12bc3099c71a257f
-  AmplifyPlugins: 1335f0919aa07329df58685a020f2311c75a5176
-  AmplifyTestCommon: fef1ca37417681cc246d0860cd18e4c6723fbbf7
-  AWSAuthCore: 544324f7c595cba78440027039c4429e6ce588fa
-  AWSCognitoIdentityProvider: f7364fdae1109e6f326c19e98f5ed5b5d413d929
-  AWSCognitoIdentityProviderASF: 2023303dc28588dfe95a4152e588bcea5e1f57ec
-  AWSComprehend: 02d3e783de8d437c3065f700096f479b347596f0
-  AWSCore: ff962198e35c750cb1d59cd459c51f1990e3ec68
-  AWSMobileClient: 9fab7504e6403dda5988471aa82cfd33ef8a8b78
-  AWSPluginsCore: f2188458c27e6cb09597c67876f80611d14275d7
-  AWSPolly: 12226039d51373059d170164ac15c3c6a8d19fb9
-  AWSRekognition: d25a1da0157854b227e5dcc95823b2cc2cee5ea4
-  AWSTextract: e07c626d7817b0807f916f9a6ad45fb420f896a2
-  AWSTranscribeStreaming: 7f11ca7f6b45dfecf043505be10d3abebf3a63ad
-  AWSTranslate: cc7f525bcabd978807ff9b5362d4fae83d45e139
+  Amplify: f29d16cb83721f4a680336506308dc84b4af757e
+  AmplifyPlugins: 7a2376a6eb7f51af3202f83bbaf9d81543dff811
+  AmplifyTestCommon: 2a13eb1404b21401b8c15a2464e6345029de4c02
+  AWSAuthCore: f80d57f22ad0c781082658de8f941393ea21b955
+  AWSCognitoIdentityProvider: 5eeb67304ea7ac853836d685f2b50c08d3194155
+  AWSCognitoIdentityProviderASF: aaa2eb46b9775090081b33fb5134090ba253e889
+  AWSComprehend: be8422fe7df1d85bf8316a0623139726b7aafd33
+  AWSCore: 6d8aa46c210e37f15c10509437a9c8570f7290bd
+  AWSMobileClient: 07c4cf156a1b3715cdf15493cdf11aade97d2369
+  AWSPluginsCore: 2a3b2eabc70f2bec67081a150986b9d3089dbe12
+  AWSPolly: a269335d269107d05b045d29cb42c3af94ad0bf7
+  AWSRekognition: 5b5f2b4540f8cdcd1bf9010d1920df6c19513026
+  AWSTextract: baaaac9cd1e98a775c78e916d4076cbab2faef33
+  AWSTranscribeStreaming: 0fdb2450a4e64cdf950f0283051b30ed43a9055d
+  AWSTranslate: c452252ee1bd6b663bcf438c38f6072e138ef491
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: 42bf8c5e4e5e663f51100ddfa68caf7cfcf64ab6
   CwlMachBadInstructionHandler: b982c7e3e44fcfa1c680e8046f6bba35f3476d65
diff --git a/AmplifyPlugins/Storage/Podfile.lock b/AmplifyPlugins/Storage/Podfile.lock
index b884c88fb5..4745a704db 100644
--- a/AmplifyPlugins/Storage/Podfile.lock
+++ b/AmplifyPlugins/Storage/Podfile.lock
@@ -1,42 +1,42 @@
 PODS:
-  - Amplify (1.30.4):
-    - Amplify/Default (= 1.30.4)
-  - Amplify/Default (1.30.4)
-  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.4):
+  - Amplify (1.30.5):
+    - Amplify/Default (= 1.30.5)
+  - Amplify/Default (1.30.5)
+  - AmplifyPlugins/AWSCognitoAuthPlugin (1.30.5):
     - AWSAuthCore (~> 2.33.0)
     - AWSCognitoIdentityProvider (~> 2.33.0)
     - AWSCognitoIdentityProviderASF (~> 2.33.0)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
-  - AmplifyTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
-    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
+  - AmplifyTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
+    - AmplifyTestCommon/AWSPluginsTestCommon (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.4):
-    - Amplify (= 1.30.4)
+  - AmplifyTestCommon/AWSPluginsTestCommon (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
     - AWSMobileClient (~> 2.33.0)
-    - AWSPluginsCore (= 1.30.4)
+    - AWSPluginsCore (= 1.30.5)
     - CwlPreconditionTesting (~> 2.0)
-  - AWSAuthCore (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProvider (2.33.0):
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSCognitoIdentityProviderASF (2.33.0):
-    - AWSCore (= 2.33.0)
-  - AWSCore (2.33.0)
-  - AWSMobileClient (2.33.0):
-    - AWSAuthCore (= 2.33.0)
-    - AWSCognitoIdentityProvider (= 2.33.0)
-    - AWSCognitoIdentityProviderASF (= 2.33.0)
-    - AWSCore (= 2.33.0)
-  - AWSPluginsCore (1.30.4):
-    - Amplify (= 1.30.4)
+  - AWSAuthCore (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProvider (2.33.5):
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSCognitoIdentityProviderASF (2.33.5):
+    - AWSCore (= 2.33.5)
+  - AWSCore (2.33.5)
+  - AWSMobileClient (2.33.5):
+    - AWSAuthCore (= 2.33.5)
+    - AWSCognitoIdentityProvider (= 2.33.5)
+    - AWSCognitoIdentityProviderASF (= 2.33.5)
+    - AWSCore (= 2.33.5)
+  - AWSPluginsCore (1.30.5):
+    - Amplify (= 1.30.5)
     - AWSCore (~> 2.33.0)
-  - AWSS3 (2.33.0):
-    - AWSCore (= 2.33.0)
+  - AWSS3 (2.33.5):
+    - AWSCore (= 2.33.5)
   - CwlCatchException (2.1.1):
     - CwlCatchExceptionSupport (~> 2.1.1)
   - CwlCatchExceptionSupport (2.1.1)
@@ -94,16 +94,16 @@ CHECKOUT OPTIONS:
     :tag: 2.1.0
 
 SPEC CHECKSUMS:
-  Amplify: 4e41668c8801667e174ab50c12bc3099c71a257f
-  AmplifyPlugins: 1335f0919aa07329df58685a020f2311c75a5176
-  AmplifyTestCommon: fef1ca37417681cc246d0860cd18e4c6723fbbf7
-  AWSAuthCore: 544324f7c595cba78440027039c4429e6ce588fa
-  AWSCognitoIdentityProvider: f7364fdae1109e6f326c19e98f5ed5b5d413d929
-  AWSCognitoIdentityProviderASF: 2023303dc28588dfe95a4152e588bcea5e1f57ec
-  AWSCore: ff962198e35c750cb1d59cd459c51f1990e3ec68
-  AWSMobileClient: 9fab7504e6403dda5988471aa82cfd33ef8a8b78
-  AWSPluginsCore: f2188458c27e6cb09597c67876f80611d14275d7
-  AWSS3: 910b5a6ec6c6b749f6a0657483118cae54f83a11
+  Amplify: f29d16cb83721f4a680336506308dc84b4af757e
+  AmplifyPlugins: 7a2376a6eb7f51af3202f83bbaf9d81543dff811
+  AmplifyTestCommon: 2a13eb1404b21401b8c15a2464e6345029de4c02
+  AWSAuthCore: f80d57f22ad0c781082658de8f941393ea21b955
+  AWSCognitoIdentityProvider: 5eeb67304ea7ac853836d685f2b50c08d3194155
+  AWSCognitoIdentityProviderASF: aaa2eb46b9775090081b33fb5134090ba253e889
+  AWSCore: 6d8aa46c210e37f15c10509437a9c8570f7290bd
+  AWSMobileClient: 07c4cf156a1b3715cdf15493cdf11aade97d2369
+  AWSPluginsCore: 2a3b2eabc70f2bec67081a150986b9d3089dbe12
+  AWSS3: 127f7865b056756cd90d4a15c72d0822a2112fce
   CwlCatchException: 86760545af2a490a23e964d76d7c77442dbce79b
   CwlCatchExceptionSupport: a004322095d7101b945442c86adc7cec0650f676
   CwlMachBadInstructionHandler: aa1fe9f2d08b29507c150d099434b2890247e7f8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17a09e6652..09d204b201 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 ## Unreleased
+## 1.30.5 (2023-12-13)
+
+### Bug Fixes
+
+- **datastore**: configure json encoder with sorted key (#3418)
+- **DataStore**: Reconcile mutation responses from conflict handler path (#3372)
+
 ## 1.30.4 (2023-06-29)
 
 ### Bug Fixes
diff --git a/Package.resolved b/Package.resolved
index da310f3e19..c4054b09ad 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/aws-amplify/aws-appsync-realtime-client-ios.git",
         "state": {
           "branch": null,
-          "revision": "b036e83716789c13a3480eeb292b70caa54114f2",
-          "version": "3.1.0"
+          "revision": "a08684c5004e2049c29f57a5938beae9695a1ef7",
+          "version": "3.1.2"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
         "state": {
           "branch": null,
-          "revision": "89ed8d45202f01010f65f076ea6f733d2ffaa1cb",
-          "version": "2.33.0"
+          "revision": "b48edebc0728a000f55e300b74fbce516d9a85de",
+          "version": "2.33.5"
         }
       },
       {