diff --git a/.eslint-dictionary.json b/.eslint-dictionary.json
index 13ae96bc938..f8c9d0ca702 100644
--- a/.eslint-dictionary.json
+++ b/.eslint-dictionary.json
@@ -21,6 +21,7 @@
   "amplifymeta",
   "amplifyrc",
   "amplifytools",
+  "ampx",
   "ansi",
   "apigateway",
   "apigw",
@@ -61,6 +62,7 @@
   "bugfix",
   "buildable",
   "buildspec",
+  "bundler",
   "callout",
   "camelcase",
   "cancellable",
@@ -146,6 +148,7 @@
   "errno",
   "esbuild",
   "esri",
+  "esModuleInterop",
   "etag",
   "execa",
   "executables",
@@ -434,6 +437,7 @@
   "venv",
   "verificationbucket",
   "versioned",
+  "versioning",
   "vert",
   "virtualenv",
   "vpc",
diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
index 59bab707958..3ec4b4a68fa 100644
--- a/packages/amplify-app/CHANGELOG.md
+++ b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.37-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.36...@aws-amplify/amplify-app@5.0.37-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
 ## [5.0.36](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.35...@aws-amplify/amplify-app@5.0.36) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-app
diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
index 37ecbfabf82..ef6198a978a 100644
--- a/packages/amplify-app/package.json
+++ b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-app",
-  "version": "5.0.36",
+  "version": "5.0.37-gen2-migrations-test.0",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@aws-amplify/amplify-frontend-android": "3.5.8",
     "@aws-amplify/amplify-frontend-flutter": "1.4.7",
-    "@aws-amplify/amplify-frontend-ios": "3.7.7",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.18",
+    "@aws-amplify/amplify-frontend-ios": "3.7.8-gen2-migrations-test.0",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.19-gen2-migrations-test.0",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-appsync-simulator/CHANGELOG.md b/packages/amplify-appsync-simulator/CHANGELOG.md
index 97e6b671dd2..38deb366da4 100644
--- a/packages/amplify-appsync-simulator/CHANGELOG.md
+++ b/packages/amplify-appsync-simulator/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.16.6-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.16.5...@aws-amplify/amplify-appsync-simulator@2.16.6-gen2-migrations-test.0) (2024-09-23)
+
+
+### Bug Fixes
+
+* remove node-ip dependency ([#13877](https://github.com/aws-amplify/amplify-cli/issues/13877)) ([5e9cd5e](https://github.com/aws-amplify/amplify-cli/commit/5e9cd5ee0ee851f10ecbaef80817a19a7b3e04a1))
+
+
+
+
+
 ## [2.16.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.16.4...@aws-amplify/amplify-appsync-simulator@2.16.5) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
index 6a77bcaf69e..90993bd0e59 100644
--- a/packages/amplify-appsync-simulator/package.json
+++ b/packages/amplify-appsync-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.16.5",
+  "version": "2.16.6-gen2-migrations-test.0",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/packages/amplify-category-analytics/CHANGELOG.md
index a654adbe11b..785d917a551 100644
--- a/packages/amplify-category-analytics/CHANGELOG.md
+++ b/packages/amplify-category-analytics/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.37-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.36...@aws-amplify/amplify-category-analytics@5.0.37-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
 ## [5.0.36](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.35...@aws-amplify/amplify-category-analytics@5.0.36) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-analytics
diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
index 75c94d8184d..9e6203b655b 100644
--- a/packages/amplify-category-analytics/package.json
+++ b/packages/amplify-category-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-analytics",
-  "version": "5.0.36",
+  "version": "5.0.37-gen2-migrations-test.0",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"
diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
index 3f5016d5fcf..01c13416d10 100644
--- a/packages/amplify-category-auth/CHANGELOG.md
+++ b/packages/amplify-category-auth/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.16-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.15...@aws-amplify/amplify-category-auth@3.7.16-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-auth
+
+
+
+
+
 ## [3.7.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.14...@aws-amplify/amplify-category-auth@3.7.15) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-auth
diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
index 7f8faed74fb..d6ed898b4bb 100644
--- a/packages/amplify-category-auth/package.json
+++ b/packages/amplify-category-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-auth",
-  "version": "3.7.15",
+  "version": "3.7.16-gen2-migrations-test.0",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@aws-amplify/amplify-util-import": "2.8.3",
-    "@aws-amplify/cli-extensibility-helper": "3.0.34",
+    "@aws-amplify/cli-extensibility-helper": "3.0.35-gen2-migrations-test.0",
     "amplify-headless-interface": "1.17.7",
     "amplify-util-headless-input": "1.9.18",
     "aws-cdk-lib": "~2.129.0",
diff --git a/packages/amplify-category-custom/CHANGELOG.md b/packages/amplify-category-custom/CHANGELOG.md
index 22e5bc2d425..eed25ba2e89 100644
--- a/packages/amplify-category-custom/CHANGELOG.md
+++ b/packages/amplify-category-custom/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.25-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-custom@3.1.24...@aws-amplify/amplify-category-custom@3.1.25-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-custom
+
+
+
+
+
 ## [3.1.24](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-custom@3.1.23...@aws-amplify/amplify-category-custom@3.1.24) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-custom
diff --git a/packages/amplify-category-custom/package.json b/packages/amplify-category-custom/package.json
index 617d7d6d7fb..b9610e2d226 100644
--- a/packages/amplify-category-custom/package.json
+++ b/packages/amplify-category-custom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-custom",
-  "version": "3.1.24",
+  "version": "3.1.25-gen2-migrations-test.0",
   "description": "amplify-cli custom resources plugin",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "aws-cdk-lib": "~2.129.0",
     "execa": "^5.1.1",
diff --git a/packages/amplify-category-function/CHANGELOG.md b/packages/amplify-category-function/CHANGELOG.md
index d845aadeeb8..1a8fbb9445f 100644
--- a/packages/amplify-category-function/CHANGELOG.md
+++ b/packages/amplify-category-function/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.7.11-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-function@5.7.10...@aws-amplify/amplify-category-function@5.7.11-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-function
+
+
+
+
+
 ## [5.7.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-function@5.7.9...@aws-amplify/amplify-category-function@5.7.10) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-function
diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
index 8894a7ad9b5..9b31ca10d9b 100644
--- a/packages/amplify-category-function/package.json
+++ b/packages/amplify-category-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-function",
-  "version": "5.7.10",
+  "version": "5.7.11-gen2-migrations-test.0",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "archiver": "^5.3.0",
diff --git a/packages/amplify-category-geo/CHANGELOG.md b/packages/amplify-category-geo/CHANGELOG.md
index 69c01a36803..b15a7461d4c 100644
--- a/packages/amplify-category-geo/CHANGELOG.md
+++ b/packages/amplify-category-geo/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.5.16-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-geo@3.5.15...@aws-amplify/amplify-category-geo@3.5.16-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-geo
+
+
+
+
+
 ## [3.5.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-geo@3.5.14...@aws-amplify/amplify-category-geo@3.5.15) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-geo
diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
index b3c559c7a96..d5e64e63231 100644
--- a/packages/amplify-category-geo/package.json
+++ b/packages/amplify-category-geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-geo",
-  "version": "3.5.15",
+  "version": "3.5.16-gen2-migrations-test.0",
   "description": "Amplify CLI plugin to manage the Geo resources for the project",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "ajv": "^6.12.6",
     "amplify-headless-interface": "1.17.7",
diff --git a/packages/amplify-category-hosting/CHANGELOG.md b/packages/amplify-category-hosting/CHANGELOG.md
index e35a21c877d..bdca039aaa8 100644
--- a/packages/amplify-category-hosting/CHANGELOG.md
+++ b/packages/amplify-category-hosting/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.5.38-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-hosting@3.5.37...@aws-amplify/amplify-category-hosting@3.5.38-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-hosting
+
+
+
+
+
 ## [3.5.37](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-hosting@3.5.36...@aws-amplify/amplify-category-hosting@3.5.37) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-hosting
diff --git a/packages/amplify-category-hosting/package.json b/packages/amplify-category-hosting/package.json
index 2a739ec606f..b79303de0d0 100644
--- a/packages/amplify-category-hosting/package.json
+++ b/packages/amplify-category-hosting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-hosting",
-  "version": "3.5.37",
+  "version": "3.5.38-gen2-migrations-test.0",
   "description": "amplify-cli hosting plugin",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "test": "jest --logHeapUsage --coverage"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-category-interactions/CHANGELOG.md b/packages/amplify-category-interactions/CHANGELOG.md
index f66f64d3115..6a65dad5358 100644
--- a/packages/amplify-category-interactions/CHANGELOG.md
+++ b/packages/amplify-category-interactions/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.1.30-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-interactions@5.1.29...@aws-amplify/amplify-category-interactions@5.1.30-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-interactions
+
+
+
+
+
 ## [5.1.29](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-interactions@5.1.28...@aws-amplify/amplify-category-interactions@5.1.29) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-interactions
diff --git a/packages/amplify-category-interactions/package.json b/packages/amplify-category-interactions/package.json
index 263d583731c..a9e1859af4b 100644
--- a/packages/amplify-category-interactions/package.json
+++ b/packages/amplify-category-interactions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-interactions",
-  "version": "5.1.29",
+  "version": "5.1.30-gen2-migrations-test.0",
   "description": "amplify-cli interactions plugin",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "fs-extra": "^8.1.0",
     "fuzzy": "^0.1.3",
diff --git a/packages/amplify-category-notifications/CHANGELOG.md b/packages/amplify-category-notifications/CHANGELOG.md
index 933a6570288..0142c4154bc 100644
--- a/packages/amplify-category-notifications/CHANGELOG.md
+++ b/packages/amplify-category-notifications/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.26.24-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-notifications@2.26.23...@aws-amplify/amplify-category-notifications@2.26.24-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-notifications
+
+
+
+
+
 ## [2.26.23](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-notifications@2.26.22...@aws-amplify/amplify-category-notifications@2.26.23) (2024-08-06)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-notifications
diff --git a/packages/amplify-category-notifications/package.json b/packages/amplify-category-notifications/package.json
index 51fe27c3df4..b1e19fef351 100644
--- a/packages/amplify-category-notifications/package.json
+++ b/packages/amplify-category-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-notifications",
-  "version": "2.26.23",
+  "version": "2.26.24-gen2-migrations-test.0",
   "description": "amplify-cli notifications plugin",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "@aws-amplify/amplify-provider-awscloudformation": "8.10.13",
+    "@aws-amplify/amplify-provider-awscloudformation": "8.10.14-gen2-migrations-test.0",
     "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-category-predictions/CHANGELOG.md b/packages/amplify-category-predictions/CHANGELOG.md
index 931d01fb382..c121e7824ba 100644
--- a/packages/amplify-category-predictions/CHANGELOG.md
+++ b/packages/amplify-category-predictions/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.5.16-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-predictions@5.5.15...@aws-amplify/amplify-category-predictions@5.5.16-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-predictions
+
+
+
+
+
 ## [5.5.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-predictions@5.5.14...@aws-amplify/amplify-category-predictions@5.5.15) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-predictions
diff --git a/packages/amplify-category-predictions/package.json b/packages/amplify-category-predictions/package.json
index 6b08cbc0397..9219211c37a 100644
--- a/packages/amplify-category-predictions/package.json
+++ b/packages/amplify-category-predictions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-predictions",
-  "version": "5.5.15",
+  "version": "5.5.16-gen2-migrations-test.0",
   "description": "amplify-cli predictions plugin",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
diff --git a/packages/amplify-category-storage/CHANGELOG.md b/packages/amplify-category-storage/CHANGELOG.md
index aaf3c54c9d6..4bbf2ff88d9 100644
--- a/packages/amplify-category-storage/CHANGELOG.md
+++ b/packages/amplify-category-storage/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.5.16-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-storage@5.5.15...@aws-amplify/amplify-category-storage@5.5.16-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-storage
+
+
+
+
+
 ## [5.5.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-storage@5.5.14...@aws-amplify/amplify-category-storage@5.5.15) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-storage
diff --git a/packages/amplify-category-storage/package.json b/packages/amplify-category-storage/package.json
index b0c514af614..e834735c5ae 100644
--- a/packages/amplify-category-storage/package.json
+++ b/packages/amplify-category-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-storage",
-  "version": "5.5.15",
+  "version": "5.5.16-gen2-migrations-test.0",
   "description": "amplify-cli storage plugin",
   "repository": {
     "type": "git",
@@ -27,11 +27,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@aws-amplify/amplify-util-import": "2.8.3",
-    "@aws-amplify/cli-extensibility-helper": "3.0.34",
+    "@aws-amplify/cli-extensibility-helper": "3.0.35-gen2-migrations-test.0",
     "amplify-headless-interface": "1.17.7",
     "amplify-util-headless-input": "1.9.18",
     "aws-cdk-lib": "~2.129.0",
diff --git a/packages/amplify-cli-core/CHANGELOG.md b/packages/amplify-cli-core/CHANGELOG.md
index 0a3fa29e38c..f5da64462c1 100644
--- a/packages/amplify-cli-core/CHANGELOG.md
+++ b/packages/amplify-cli-core/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.4.0-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-cli-core@4.3.10...@aws-amplify/amplify-cli-core@4.4.0-gen2-migrations-test.0) (2024-09-23)
+
+
+### Features
+
+* add enableGen2Migration feature flag ([#13851](https://github.com/aws-amplify/amplify-cli/issues/13851)) ([48ba8b1](https://github.com/aws-amplify/amplify-cli/commit/48ba8b1b7ce9a703f3f8900c3e1671c339822458))
+
+
+
+
+
 ## [4.3.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-cli-core@4.3.9...@aws-amplify/amplify-cli-core@4.3.10) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-cli-core
diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json
index 923e79602e7..7696f8a88c2 100644
--- a/packages/amplify-cli-core/package.json
+++ b/packages/amplify-cli-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-cli-core",
-  "version": "4.3.10",
+  "version": "4.4.0-gen2-migrations-test.0",
   "description": "Amplify CLI Core",
   "repository": {
     "type": "git",
diff --git a/packages/amplify-cli-extensibility-helper/CHANGELOG.md b/packages/amplify-cli-extensibility-helper/CHANGELOG.md
index b0dea8ee0d4..3bdc1b6e5e8 100644
--- a/packages/amplify-cli-extensibility-helper/CHANGELOG.md
+++ b/packages/amplify-cli-extensibility-helper/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.35-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-extensibility-helper@3.0.34...@aws-amplify/cli-extensibility-helper@3.0.35-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/cli-extensibility-helper
+
+
+
+
+
 ## [3.0.34](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-extensibility-helper@3.0.33...@aws-amplify/cli-extensibility-helper@3.0.34) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/cli-extensibility-helper
diff --git a/packages/amplify-cli-extensibility-helper/package.json b/packages/amplify-cli-extensibility-helper/package.json
index 3a93ea0dd2d..621413512c8 100644
--- a/packages/amplify-cli-extensibility-helper/package.json
+++ b/packages/amplify-cli-extensibility-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli-extensibility-helper",
-  "version": "3.0.34",
+  "version": "3.0.35-gen2-migrations-test.0",
   "description": "Amplify CLI Extensibility Helper utility package",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-custom": "3.1.24",
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-category-custom": "3.1.25-gen2-migrations-test.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "aws-cdk-lib": "~2.129.0"
   },
   "jest": {
diff --git a/packages/amplify-cli-npm/CHANGELOG.md b/packages/amplify-cli-npm/CHANGELOG.md
index f30ee8fb7e9..3eb59f45b66 100644
--- a/packages/amplify-cli-npm/CHANGELOG.md
+++ b/packages/amplify-cli-npm/CHANGELOG.md
@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [12.13.0-gen2-migration-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@12.13.0-gen2-migrations-test.0...@aws-amplify/cli@12.13.0-gen2-migration-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/cli
+
+
+
+
+
+# [12.13.0-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@12.12.6...@aws-amplify/cli@12.13.0-gen2-migrations-test.0) (2024-09-23)
+
+
+### Bug Fixes
+
+* **migrate:** update amplify-cli-npm ([eb8e0ae](https://github.com/aws-amplify/amplify-cli/commit/eb8e0aec70bd2667820f89bc55d9a4bafdc21df4))
+
+
+### Features
+
+* bump version ([db50139](https://github.com/aws-amplify/amplify-cli/commit/db50139bf37c15ed5310af3752a0567e6221b269))
+* bump version ([67cf6b9](https://github.com/aws-amplify/amplify-cli/commit/67cf6b9198a58280aedb6bf59a83460828118131))
+
+
+
+
+
 ## [12.12.6](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@12.12.5...@aws-amplify/cli@12.12.6) (2024-08-06)
 
 **Note:** Version bump only for package @aws-amplify/cli
diff --git a/packages/amplify-cli-npm/index.ts b/packages/amplify-cli-npm/index.ts
index 000f54cd029..266bc77f889 100644
--- a/packages/amplify-cli-npm/index.ts
+++ b/packages/amplify-cli-npm/index.ts
@@ -16,4 +16,4 @@ export const install = async (): Promise<void> => {
   return binary.install();
 };
 
-// Force version bump to 12.14.0
+// force version bump to 12.14.0
diff --git a/packages/amplify-cli-npm/package.json b/packages/amplify-cli-npm/package.json
index 0003638eea1..4af200cfad4 100644
--- a/packages/amplify-cli-npm/package.json
+++ b/packages/amplify-cli-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli",
-  "version": "12.12.6",
+  "version": "12.13.0-gen2-migration-test.0",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "@aws-amplify/cli-internal": "12.12.6",
+    "@aws-amplify/cli-internal": "12.13.0-gen2-migration-test.0",
     "@types/tar": "^6.1.1",
     "rimraf": "^3.0.2"
   },
diff --git a/packages/amplify-cli/CHANGELOG.md b/packages/amplify-cli/CHANGELOG.md
index a60d6e4865a..153efd35495 100644
--- a/packages/amplify-cli/CHANGELOG.md
+++ b/packages/amplify-cli/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [12.13.0-gen2-migration-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@12.13.0-gen2-migrations-test.0...@aws-amplify/cli-internal@12.13.0-gen2-migration-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/cli-internal
+
+
+
+
+
+# [12.13.0-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@12.12.6...@aws-amplify/cli-internal@12.13.0-gen2-migrations-test.0) (2024-09-23)
+
+
+### Features
+
+* **cli:** initial migration merge ([#13856](https://github.com/aws-amplify/amplify-cli/issues/13856)) ([ebe5cd0](https://github.com/aws-amplify/amplify-cli/commit/ebe5cd046cfb18c38ffdce17610ed3a133cc9d44))
+* **migrate:** make as an independent executable ([0aeffb9](https://github.com/aws-amplify/amplify-cli/commit/0aeffb96b9fad75549d76d19778725eb522ad64e))
+
+
+
+
+
 ## [12.12.6](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@12.12.5...@aws-amplify/cli-internal@12.12.6) (2024-08-06)
 
 
diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
index 453d7f043b6..8192b4ee0f5 100644
--- a/packages/amplify-cli/package.json
+++ b/packages/amplify-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli-internal",
-  "version": "12.12.6",
+  "version": "12.13.0-gen2-migration-test.0",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -34,45 +34,45 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@aws-amplify/amplify-app": "5.0.36",
-    "@aws-amplify/amplify-category-analytics": "5.0.36",
+    "@aws-amplify/amplify-app": "5.0.37-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-analytics": "5.0.37-gen2-migrations-test.0",
     "@aws-amplify/amplify-category-api": "^5.12.5",
-    "@aws-amplify/amplify-category-auth": "3.7.15",
-    "@aws-amplify/amplify-category-custom": "3.1.24",
-    "@aws-amplify/amplify-category-function": "5.7.10",
-    "@aws-amplify/amplify-category-geo": "3.5.15",
-    "@aws-amplify/amplify-category-hosting": "3.5.37",
-    "@aws-amplify/amplify-category-interactions": "5.1.29",
-    "@aws-amplify/amplify-category-notifications": "2.26.23",
-    "@aws-amplify/amplify-category-predictions": "5.5.15",
-    "@aws-amplify/amplify-category-storage": "5.5.15",
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-category-auth": "3.7.16-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-custom": "3.1.25-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-function": "5.7.11-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-geo": "3.5.16-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-hosting": "3.5.38-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-interactions": "5.1.30-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-notifications": "2.26.24-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-predictions": "5.5.16-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-storage": "5.5.16-gen2-migrations-test.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-cli-logger": "1.3.8",
     "@aws-amplify/amplify-cli-shared-interfaces": "1.2.5",
-    "@aws-amplify/amplify-console-hosting": "2.5.34",
-    "@aws-amplify/amplify-container-hosting": "2.8.12",
-    "@aws-amplify/amplify-dotnet-function-template-provider": "2.6.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-console-hosting": "2.5.35-gen2-migrations-test.0",
+    "@aws-amplify/amplify-container-hosting": "2.8.13-gen2-migrations-test.0",
+    "@aws-amplify/amplify-dotnet-function-template-provider": "2.6.11-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-frontend-android": "3.5.8",
     "@aws-amplify/amplify-frontend-flutter": "1.4.7",
-    "@aws-amplify/amplify-frontend-ios": "3.7.7",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.18",
+    "@aws-amplify/amplify-frontend-ios": "3.7.8-gen2-migrations-test.0",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.19-gen2-migrations-test.0",
     "@aws-amplify/amplify-go-function-template-provider": "1.4.8",
-    "@aws-amplify/amplify-nodejs-function-template-provider": "2.10.10",
+    "@aws-amplify/amplify-nodejs-function-template-provider": "2.10.11-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "@aws-amplify/amplify-provider-awscloudformation": "8.10.13",
+    "@aws-amplify/amplify-provider-awscloudformation": "8.10.14-gen2-migrations-test.0",
     "@aws-amplify/amplify-python-function-template-provider": "1.4.7",
     "@aws-amplify/amplify-util-import": "2.8.3",
-    "@aws-amplify/amplify-util-mock": "5.10.6",
-    "@aws-amplify/amplify-util-uibuilder": "1.14.12",
+    "@aws-amplify/amplify-util-mock": "5.10.7-gen2-migrations-test.0",
+    "@aws-amplify/amplify-util-uibuilder": "1.14.13-gen2-migrations-test.0",
     "@aws-cdk/cloudformation-diff": "~2.68.0",
     "amplify-codegen": "^4.9.4",
-    "amplify-dotnet-function-runtime-provider": "2.0.29",
-    "amplify-go-function-runtime-provider": "2.3.47",
-    "amplify-java-function-runtime-provider": "2.3.47",
+    "amplify-dotnet-function-runtime-provider": "2.0.30-gen2-migrations-test.0",
+    "amplify-go-function-runtime-provider": "2.3.48-gen2-migrations-test.0",
+    "amplify-java-function-runtime-provider": "2.3.48-gen2-migrations-test.0",
     "amplify-java-function-template-provider": "1.5.24",
-    "amplify-nodejs-function-runtime-provider": "2.5.24",
-    "amplify-python-function-runtime-provider": "2.4.47",
+    "amplify-nodejs-function-runtime-provider": "2.5.25-gen2-migrations-test.0",
+    "amplify-python-function-runtime-provider": "2.4.48-gen2-migrations-test.0",
     "aws-cdk-lib": "~2.129.0",
     "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
diff --git a/packages/amplify-console-hosting/CHANGELOG.md b/packages/amplify-console-hosting/CHANGELOG.md
index f5181efbac3..ad2d2462556 100644
--- a/packages/amplify-console-hosting/CHANGELOG.md
+++ b/packages/amplify-console-hosting/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.35-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-console-hosting@2.5.34...@aws-amplify/amplify-console-hosting@2.5.35-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-console-hosting
+
+
+
+
+
 ## [2.5.34](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-console-hosting@2.5.33...@aws-amplify/amplify-console-hosting@2.5.34) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-console-hosting
diff --git a/packages/amplify-console-hosting/package.json b/packages/amplify-console-hosting/package.json
index ec21ba2f581..d6627ef1e82 100644
--- a/packages/amplify-console-hosting/package.json
+++ b/packages/amplify-console-hosting/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@aws-amplify/amplify-console-hosting",
-  "version": "2.5.34",
+  "version": "2.5.35-gen2-migrations-test.0",
   "description": "cli plugin for AWS Amplify Console hosting",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.1",
     "cli-table3": "^0.6.0",
diff --git a/packages/amplify-console-integration-tests/CHANGELOG.md b/packages/amplify-console-integration-tests/CHANGELOG.md
index a84ed98d6c4..627f85f0a0d 100644
--- a/packages/amplify-console-integration-tests/CHANGELOG.md
+++ b/packages/amplify-console-integration-tests/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.11.16-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-console-integration-tests/compare/@aws-amplify/amplify-console-integration-tests@2.11.15...@aws-amplify/amplify-console-integration-tests@2.11.16-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-console-integration-tests
+
+
+
+
+
 ## [2.11.15](https://github.com/aws-amplify/amplify-console-integration-tests/compare/@aws-amplify/amplify-console-integration-tests@2.11.14...@aws-amplify/amplify-console-integration-tests@2.11.15) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-console-integration-tests
diff --git a/packages/amplify-console-integration-tests/package.json b/packages/amplify-console-integration-tests/package.json
index a0f09b8ec90..7912d868825 100644
--- a/packages/amplify-console-integration-tests/package.json
+++ b/packages/amplify-console-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-console-integration-tests",
-  "version": "2.11.15",
+  "version": "2.11.16-gen2-migrations-test.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -21,8 +21,8 @@
     "setup-profile": "ts-node ./src/setup-profile.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-e2e-core": "5.5.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-e2e-core": "5.5.11-gen2-migrations-test.0",
     "@types/ini": "^1.3.30",
     "aws-sdk": "^2.1464.0",
     "dotenv": "^8.2.0",
diff --git a/packages/amplify-container-hosting/CHANGELOG.md b/packages/amplify-container-hosting/CHANGELOG.md
index ac0c7bf1ab4..a0fc116d722 100644
--- a/packages/amplify-container-hosting/CHANGELOG.md
+++ b/packages/amplify-container-hosting/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.8.13-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-container-hosting@2.8.12...@aws-amplify/amplify-container-hosting@2.8.13-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-container-hosting
+
+
+
+
+
 ## [2.8.12](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-container-hosting@2.8.11...@aws-amplify/amplify-container-hosting@2.8.12) (2024-08-06)
 
 
diff --git a/packages/amplify-container-hosting/package.json b/packages/amplify-container-hosting/package.json
index 7d16ca35fc3..eb52f940ad4 100644
--- a/packages/amplify-container-hosting/package.json
+++ b/packages/amplify-container-hosting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-container-hosting",
-  "version": "2.8.12",
+  "version": "2.8.13-gen2-migrations-test.0",
   "description": "amplify-cli hosting plugin for containers",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-category-api": "^5.12.5",
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "mime-types": "^2.1.26",
diff --git a/packages/amplify-dotnet-function-runtime-provider/CHANGELOG.md b/packages/amplify-dotnet-function-runtime-provider/CHANGELOG.md
index 1bf518f92e9..651ba094fc6 100644
--- a/packages/amplify-dotnet-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-dotnet-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.30-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-dotnet-function-runtime-provider@2.0.29...amplify-dotnet-function-runtime-provider@2.0.30-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package amplify-dotnet-function-runtime-provider
+
+
+
+
+
 ## [2.0.29](https://github.com/aws-amplify/amplify-cli/compare/amplify-dotnet-function-runtime-provider@2.0.28...amplify-dotnet-function-runtime-provider@2.0.29) (2024-08-02)
 
 **Note:** Version bump only for package amplify-dotnet-function-runtime-provider
diff --git a/packages/amplify-dotnet-function-runtime-provider/package.json b/packages/amplify-dotnet-function-runtime-provider/package.json
index 2715cfbf60a..f1b10f28fe5 100644
--- a/packages/amplify-dotnet-function-runtime-provider/package.json
+++ b/packages/amplify-dotnet-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-dotnet-function-runtime-provider",
-  "version": "2.0.29",
+  "version": "2.0.30-gen2-migrations-test.0",
   "description": "Provides functionality related to functions in .NET on AWS",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "execa": "^5.1.1",
diff --git a/packages/amplify-dotnet-function-template-provider/CHANGELOG.md b/packages/amplify-dotnet-function-template-provider/CHANGELOG.md
index 2ff5c14c813..4c4969ad6eb 100644
--- a/packages/amplify-dotnet-function-template-provider/CHANGELOG.md
+++ b/packages/amplify-dotnet-function-template-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.11-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-dotnet-function-template-provider@2.6.10...@aws-amplify/amplify-dotnet-function-template-provider@2.6.11-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-dotnet-function-template-provider
+
+
+
+
+
 ## [2.6.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-dotnet-function-template-provider@2.6.9...@aws-amplify/amplify-dotnet-function-template-provider@2.6.10) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-dotnet-function-template-provider
diff --git a/packages/amplify-dotnet-function-template-provider/package.json b/packages/amplify-dotnet-function-template-provider/package.json
index f2337bec1c0..3cb3d3ebfc5 100644
--- a/packages/amplify-dotnet-function-template-provider/package.json
+++ b/packages/amplify-dotnet-function-template-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-dotnet-function-template-provider",
-  "version": "2.6.10",
+  "version": "2.6.11-gen2-migrations-test.0",
   "description": ".NET templates supplied by the Amplify Team",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "graphql-transformer-core": "^8.2.13"
   },
diff --git a/packages/amplify-dynamodb-simulator/CHANGELOG.md b/packages/amplify-dynamodb-simulator/CHANGELOG.md
index 108b290bdbf..113a1486b5e 100644
--- a/packages/amplify-dynamodb-simulator/CHANGELOG.md
+++ b/packages/amplify-dynamodb-simulator/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.20-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-dynamodb-simulator@2.9.19...amplify-dynamodb-simulator@2.9.20-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package amplify-dynamodb-simulator
+
+
+
+
+
 ## [2.9.19](https://github.com/aws-amplify/amplify-cli/compare/amplify-dynamodb-simulator@2.9.18...amplify-dynamodb-simulator@2.9.19) (2024-08-02)
 
 **Note:** Version bump only for package amplify-dynamodb-simulator
diff --git a/packages/amplify-dynamodb-simulator/package.json b/packages/amplify-dynamodb-simulator/package.json
index c82011b8c21..6e8d9968eae 100644
--- a/packages/amplify-dynamodb-simulator/package.json
+++ b/packages/amplify-dynamodb-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-dynamodb-simulator",
-  "version": "2.9.19",
+  "version": "2.9.20-gen2-migrations-test.0",
   "description": "DynamoDB emulator nodejs wrapper",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "test": "jest --logHeapUsage --passWithNoTests"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "aws-sdk": "^2.1464.0",
     "detect-port": "^1.3.0",
     "execa": "^5.1.1",
diff --git a/packages/amplify-e2e-core/CHANGELOG.md b/packages/amplify-e2e-core/CHANGELOG.md
index aec507461d5..7d6b595733e 100644
--- a/packages/amplify-e2e-core/CHANGELOG.md
+++ b/packages/amplify-e2e-core/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.5.11-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-e2e-core@5.5.10...@aws-amplify/amplify-e2e-core@5.5.11-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-e2e-core
+
+
+
+
+
 ## [5.5.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-e2e-core@5.5.9...@aws-amplify/amplify-e2e-core@5.5.10) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-e2e-core
diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json
index ceb3a549d99..3fe67182341 100644
--- a/packages/amplify-e2e-core/package.json
+++ b/packages/amplify-e2e-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-e2e-core",
-  "version": "5.5.10",
+  "version": "5.5.11-gen2-migrations-test.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "clean": "rimraf ./lib tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-sdk/client-sts": "^3.303.0",
     "@aws-sdk/credential-providers": "^3.303.0",
     "amplify-headless-interface": "1.17.7",
diff --git a/packages/amplify-e2e-tests/CHANGELOG.md b/packages/amplify-e2e-tests/CHANGELOG.md
index 563b5dee805..332bc208ae3 100644
--- a/packages/amplify-e2e-tests/CHANGELOG.md
+++ b/packages/amplify-e2e-tests/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.9.12-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-e2e-tests@4.9.11...amplify-e2e-tests@4.9.12-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package amplify-e2e-tests
+
+
+
+
+
 ## [4.9.11](https://github.com/aws-amplify/amplify-cli/compare/amplify-e2e-tests@4.9.10...amplify-e2e-tests@4.9.11) (2024-08-02)
 
 **Note:** Version bump only for package amplify-e2e-tests
diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
index 08e4038f34b..0fce8f28a2b 100644
--- a/packages/amplify-e2e-tests/package.json
+++ b/packages/amplify-e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-e2e-tests",
-  "version": "4.9.11",
+  "version": "4.9.12-gen2-migrations-test.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -25,10 +25,10 @@
     "smoketest": "yarn e2e --testPathPattern='src/__tests__/smoke-tests/.*.test.ts'"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-auth": "3.7.15",
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-e2e-core": "5.5.10",
-    "@aws-amplify/amplify-opensearch-simulator": "1.7.15",
+    "@aws-amplify/amplify-category-auth": "3.7.16-gen2-migrations-test.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-e2e-core": "5.5.11-gen2-migrations-test.0",
+    "@aws-amplify/amplify-opensearch-simulator": "1.7.16-gen2-migrations-test.0",
     "@aws-amplify/graphql-transformer-core": "^2.9.3",
     "@aws-sdk/client-appsync": "^3.303.0",
     "@aws-sdk/client-dynamodb": "^3.303.0",
@@ -36,7 +36,7 @@
     "@aws-sdk/client-ssm": "^3.303.0",
     "@babel/core": "^7.23.2",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
-    "amplify-dynamodb-simulator": "2.9.19",
+    "amplify-dynamodb-simulator": "2.9.20-gen2-migrations-test.0",
     "amplify-headless-interface": "1.17.7",
     "amplify-storage-simulator": "1.11.3",
     "aws-amplify": "^5.3.16",
diff --git a/packages/amplify-environment-parameters/CHANGELOG.md b/packages/amplify-environment-parameters/CHANGELOG.md
index 18f33221ef4..56435b43f33 100644
--- a/packages/amplify-environment-parameters/CHANGELOG.md
+++ b/packages/amplify-environment-parameters/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.16-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-environment-parameters@1.9.15...@aws-amplify/amplify-environment-parameters@1.9.16-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-environment-parameters
+
+
+
+
+
 ## [1.9.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-environment-parameters@1.9.14...@aws-amplify/amplify-environment-parameters@1.9.15) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-environment-parameters
diff --git a/packages/amplify-environment-parameters/package.json b/packages/amplify-environment-parameters/package.json
index 6b771ce091c..42e00b628c8 100644
--- a/packages/amplify-environment-parameters/package.json
+++ b/packages/amplify-environment-parameters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-environment-parameters",
-  "version": "1.9.15",
+  "version": "1.9.16-gen2-migrations-test.0",
   "description": "Amplify CLI environment parameter manager",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "generate-schemas": "mkdirp lib/schemas src/schemas && ts-json-schema-generator --path src/backend-parameters.d.ts --type BackendParameters --no-type-check --out lib/schemas/BackendParameters.schema.json && copyfiles --flat lib/schemas/BackendParameters.schema.json src/schemas"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "ajv": "^6.12.6",
     "lodash": "^4.17.21"
   },
diff --git a/packages/amplify-frontend-ios/CHANGELOG.md b/packages/amplify-frontend-ios/CHANGELOG.md
index e31d1c5dad1..70ad65819bf 100644
--- a/packages/amplify-frontend-ios/CHANGELOG.md
+++ b/packages/amplify-frontend-ios/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.8-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-frontend-ios@3.7.7...@aws-amplify/amplify-frontend-ios@3.7.8-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-frontend-ios
+
+
+
+
+
 ## [3.7.7](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-frontend-ios@3.7.6...@aws-amplify/amplify-frontend-ios@3.7.7) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-frontend-ios
diff --git a/packages/amplify-frontend-ios/package.json b/packages/amplify-frontend-ios/package.json
index dccbd59cf81..d353eb14aac 100644
--- a/packages/amplify-frontend-ios/package.json
+++ b/packages/amplify-frontend-ios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-frontend-ios",
-  "version": "3.7.7",
+  "version": "3.7.8-gen2-migrations-test.0",
   "description": "amplify-cli front-end plugin for xcode projects",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
     "graphql-config": "^2.2.1",
diff --git a/packages/amplify-frontend-javascript/CHANGELOG.md b/packages/amplify-frontend-javascript/CHANGELOG.md
index 908cdb690f5..d7bb552b68b 100644
--- a/packages/amplify-frontend-javascript/CHANGELOG.md
+++ b/packages/amplify-frontend-javascript/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.10.19-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-frontend-javascript@3.10.18...@aws-amplify/amplify-frontend-javascript@3.10.19-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-frontend-javascript
+
+
+
+
+
 ## [3.10.18](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-frontend-javascript@3.10.17...@aws-amplify/amplify-frontend-javascript@3.10.18) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-frontend-javascript
diff --git a/packages/amplify-frontend-javascript/package.json b/packages/amplify-frontend-javascript/package.json
index fb99e7b1d2a..aeac026dfaa 100644
--- a/packages/amplify-frontend-javascript/package.json
+++ b/packages/amplify-frontend-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-frontend-javascript",
-  "version": "3.10.18",
+  "version": "3.10.19-gen2-migrations-test.0",
   "description": "amplify-cli front-end plugin for JavaScript projects",
   "scripts": {
     "test": "jest --logHeapUsage",
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@babel/core": "^7.23.2",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
     "chalk": "^4.1.1",
diff --git a/packages/amplify-gen1-codegen-auth-adapter/CHANGELOG.md b/packages/amplify-gen1-codegen-auth-adapter/CHANGELOG.md
new file mode 100644
index 00000000000..879f86ae6ab
--- /dev/null
+++ b/packages/amplify-gen1-codegen-auth-adapter/CHANGELOG.md
@@ -0,0 +1,44 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0-gen2-migrations-test.0 (2024-09-23)
+
+
+### Bug Fixes
+
+* add attribute mapping for external providers ([4f4d9fd](https://github.com/aws-amplify/amplify-cli/commit/4f4d9fd261eefbaca6bd3a563b03e59573869e91))
+* add checks for no min/max values provided for custom attributes ([ce55cb3](https://github.com/aws-amplify/amplify-cli/commit/ce55cb37d99e4e0f4f7325fd9626fa950eb34a9e))
+* add relevant removed code due to incorrect merge ([fe1ab64](https://github.com/aws-amplify/amplify-cli/commit/fe1ab6430a668fb55e280552cb358ae97503d002))
+* add test cases for source builder and synthesizer ([c7bb106](https://github.com/aws-amplify/amplify-cli/commit/c7bb10681a1cbdd1e92eebcc81357399cf681362))
+* correct package versions; remove unused import ([2855e28](https://github.com/aws-amplify/amplify-cli/commit/2855e28744bc0d319ff85d7a7a1a36d5fbdad253))
+* extract api ([6f4c58b](https://github.com/aws-amplify/amplify-cli/commit/6f4c58b947fa3be4c2c7c200484fa46b6823bb30))
+* lint spellcheck and unexpected any error ([5b85e96](https://github.com/aws-amplify/amplify-cli/commit/5b85e96ae87ab3278313010a8b0837b61cac37d7))
+* make gen2 migration packages public ([a7832cb](https://github.com/aws-amplify/amplify-cli/commit/a7832cb622cabf3eec3f770393477256117ea47d))
+* resolve incorrect mfaconifg option ([5f1dd79](https://github.com/aws-amplify/amplify-cli/commit/5f1dd79bbebab1616a5752524d2ecb0ec255fd1a))
+* resolve lint and extract-api errors ([e924e3f](https://github.com/aws-amplify/amplify-cli/commit/e924e3f871e1c58767c2088c0fa8b9dc1cbfb7ec))
+* resolve policies generated in backend.ts ([12c923a](https://github.com/aws-amplify/amplify-cli/commit/12c923a2f7f513641623befdfd3ebca97429919c))
+* resolve test errors ([b6795bd](https://github.com/aws-amplify/amplify-cli/commit/b6795bd6b4918bdb3e0ad3e5ec5e9c9e642f5b56))
+
+
+### Features
+
+* add comments to gen1 triggers ([#13866](https://github.com/aws-amplify/amplify-cli/issues/13866)) ([2ec9470](https://github.com/aws-amplify/amplify-cli/commit/2ec947084a89bb000f2b34cc2662121e8cf04fb6))
+* added custom attributes codegen ([0b44538](https://github.com/aws-amplify/amplify-cli/commit/0b445387e45faaa851df93d76cdcdddb6b55f8fe))
+* **cli:** initial migration merge ([f803827](https://github.com/aws-amplify/amplify-cli/commit/f8038278b95d321aef4ff75b1bd5a604815fc821))
+* **cli:** initial migration merge ([#13856](https://github.com/aws-amplify/amplify-cli/issues/13856)) ([ebe5cd0](https://github.com/aws-amplify/amplify-cli/commit/ebe5cd046cfb18c38ffdce17610ed3a133cc9d44))
+* configure username codegen ([f032b76](https://github.com/aws-amplify/amplify-cli/commit/f032b762c870b8d50729ab044eeae87be880606e))
+* fixed lint and ran yarn extract-api ([b4f256c](https://github.com/aws-amplify/amplify-cli/commit/b4f256c3b433a38974f7a8612505d1c7c21befeb))
+* friendly userpool name codegen ([b03e5b0](https://github.com/aws-amplify/amplify-cli/commit/b03e5b03ab7fc0a70ff3981b1232c61edc0fc3a3))
+* oauth flows codegen ([8858ef9](https://github.com/aws-amplify/amplify-cli/commit/8858ef92d2f005d6ebe5363e8bb8696a9a72e8ed))
+* oauth scopes codegen ([a0edbc1](https://github.com/aws-amplify/amplify-cli/commit/a0edbc1af025ed6058ed9098da240a05f68384f2))
+* oidc/saml external providers codegen ([f248955](https://github.com/aws-amplify/amplify-cli/commit/f2489550925e2f90a53a7d0f833d53571a546ae1))
+* read/write permissions for attributes codegen ([36021a3](https://github.com/aws-amplify/amplify-cli/commit/36021a35ec554682c4aca0b32d5a82d85c04f749))
+* signup user attributes/groups auth codegen ([bacb17b](https://github.com/aws-amplify/amplify-cli/commit/bacb17b29f3bd55ac9d28b55903d4091a5786b15))
+* social auth codegen ([96cc8d5](https://github.com/aws-amplify/amplify-cli/commit/96cc8d580b39ba80745fd235bd00f2b724962adc))
+* storage triggers ([#13869](https://github.com/aws-amplify/amplify-cli/issues/13869)) ([3847399](https://github.com/aws-amplify/amplify-cli/commit/38473994e563cd90452ecc50639ea056bb8dd039))
+* unauthenticated logins codegen ([2d0b700](https://github.com/aws-amplify/amplify-cli/commit/2d0b700f099ceb36b70ab0745a562bcdd5f5ce4b))
+* update functions codegen ([a2acb75](https://github.com/aws-amplify/amplify-cli/commit/a2acb756e09ea22c59a61f05cbfbb4beec7adfbd))
+* update functions codegen ([1ef8938](https://github.com/aws-amplify/amplify-cli/commit/1ef89380028856e39cfcb2b55e8fd1bd7f6e41ed))
+* userpool groups precedence based sorting ([184c19c](https://github.com/aws-amplify/amplify-cli/commit/184c19c54c22f263f9baa734fde2d60f6c9e8663))
diff --git a/packages/amplify-gen1-codegen-auth-adapter/package.json b/packages/amplify-gen1-codegen-auth-adapter/package.json
index 4860fb57957..04752ec3fac 100644
--- a/packages/amplify-gen1-codegen-auth-adapter/package.json
+++ b/packages/amplify-gen1-codegen-auth-adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-gen1-codegen-auth-adapter",
-  "version": "0.0.1",
+  "version": "0.1.0-gen2-migrations-test.0",
   "type": "commonjs",
   "main": "lib/index.js",
   "devDependencies": {
@@ -8,7 +8,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-amplify/amplify-gen2-codegen": "^0.0.1",
+    "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0",
     "@aws-amplify/auth-construct": "^1.1.5",
     "@aws-sdk/client-amplify": "^3.592.0",
     "@aws-sdk/client-cognito-identity": "^3.592.0",
@@ -37,6 +37,9 @@
     ],
     "collectCoverage": true
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "pretest": "mkdir -p coverage",
     "test": "jest --logHeapUsage",
diff --git a/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.test.ts b/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.test.ts
index 376bb62d026..729140c0f40 100644
--- a/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.test.ts
+++ b/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.test.ts
@@ -175,6 +175,144 @@ void describe('auth codegen', () => {
         });
       });
     });
+    void it('contains oidc login if OIDC identityProvider type is passed', () => {
+      const result = getAuthDefinition({
+        userPool: {},
+        identityProvidersDetails: [
+          { ProviderType: IdentityProviderTypeType.OIDC, ProviderName: 'OIDC_1', ProviderDetails: { oidc_issuer: 'https://example.com' } },
+          { ProviderType: IdentityProviderTypeType.OIDC, ProviderName: 'OIDC_2', ProviderDetails: { oidc_issuer: 'https://example.com' } },
+        ],
+      });
+      assert(result.loginOptions?.oidcLogin);
+    });
+    void it('contains SAML login if SAML identityProvider type is passed', () => {
+      const result = getAuthDefinition({
+        userPool: {},
+        identityProvidersDetails: [
+          {
+            ProviderType: IdentityProviderTypeType.SAML,
+            ProviderName: 'SAML_1',
+            ProviderDetails: { metadataContent: 'https://example.com' },
+          },
+        ],
+      });
+      assert(result.loginOptions?.samlLogin);
+    });
+  });
+  void describe('OIDC and SAML providers', () => {
+    void describe('OIDC', () => {
+      void it('contains name and issuerUrl if OIDC identityProviderDetails is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_1',
+              ProviderDetails: {
+                oidc_issuer: 'https://example.com',
+                authorize_url: 'https://example.com',
+                token_url: 'https://example.com',
+                attributes_url: 'https://example.com',
+                jwks_uri: 'https://example.com',
+              },
+            },
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_2',
+              ProviderDetails: { oidc_issuer: 'https://example.com' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.oidcLogin, [
+          {
+            endpoints: {
+              authorization: 'https://example.com',
+              token: 'https://example.com',
+              userInfo: 'https://example.com',
+              jwksUri: 'https://example.com',
+            },
+            issuerUrl: 'https://example.com',
+            name: 'OIDC_1',
+          },
+          { issuerUrl: 'https://example.com', name: 'OIDC_2' },
+        ]);
+      });
+      void it('contains attributeMapping if AttributeMapping is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_1',
+              ProviderDetails: { oidc_issuer: 'https://example.com' },
+              AttributeMapping: { name: 'name', phone_number: 'phone_number' },
+            },
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_2',
+              ProviderDetails: { oidc_issuer: 'https://example.com' },
+              AttributeMapping: { name: 'name', phone_number: 'phone_number' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.oidcLogin, [
+          { issuerUrl: 'https://example.com', name: 'OIDC_1', attributeMapping: { fullname: 'name', phoneNumber: 'phone_number' } },
+          { issuerUrl: 'https://example.com', name: 'OIDC_2', attributeMapping: { fullname: 'name', phoneNumber: 'phone_number' } },
+        ]);
+      });
+    });
+    void describe('SAML', () => {
+      void it('contains metadataType URL if SAML identityProviderDetails and metadataURL is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.SAML,
+              ProviderName: 'SAML_1',
+              ProviderDetails: { metadataURL: 'https://example.com' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.samlLogin, {
+          metadata: { metadataContent: 'https://example.com', metadataType: 'URL' },
+          name: 'SAML_1',
+        });
+      });
+      void it('contains metadataType FILE if SAML identityProviderDetails and metadataContent is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.SAML,
+              ProviderName: 'SAML_1',
+              ProviderDetails: { metadataContent: 'https://example.com' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.samlLogin, {
+          metadata: { metadataContent: 'https://example.com', metadataType: 'FILE' },
+          name: 'SAML_1',
+        });
+      });
+      void it('contains attributeMapping if AttributeMapping is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.SAML,
+              ProviderName: 'SAML_1',
+              ProviderDetails: { metadataContent: 'https://example.com' },
+              AttributeMapping: { name: 'name', phone_number: 'phone_number' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.samlLogin, {
+          attributeMapping: { fullname: 'name', phoneNumber: 'phone_number' },
+          metadata: { metadataContent: 'https://example.com', metadataType: 'FILE' },
+          name: 'SAML_1',
+        });
+      });
+    });
   });
   void describe('callback URLs and logout URLs', () => {
     void it('contains callback urls if callbackURLs array is passed', () => {
@@ -204,7 +342,7 @@ void describe('auth codegen', () => {
       for (const key in defaultPasswordPolicy) {
         const typedKey = key as keyof PasswordPolicyType;
         const testValue = defaultPasswordPolicy[typedKey];
-        void it(`does not explicitly override the value for ${typedKey} when set to the default value of ${testValue}`, () => {
+        void it(`does explicitly override the value for ${typedKey} when set to the default value of ${testValue}`, () => {
           const result = getAuthDefinition({
             userPool: {
               Policies: {
@@ -214,7 +352,7 @@ void describe('auth codegen', () => {
               },
             },
           });
-          assert(!(`Policies.PasswordPolicy.${typedKey}` in result.userPoolOverrides!));
+          assert(`Policies.PasswordPolicy.${typedKey}` in result.userPoolOverrides!);
         });
       }
     });
@@ -462,7 +600,7 @@ void describe('auth codegen', () => {
       const result = getAuthDefinition({
         userPool: { Name: 'test' },
       });
-      assert.deepEqual(result.userPoolOverrides, { UserPoolName: 'test', UsernameAttributes: [] });
+      assert.deepEqual(result.userPoolOverrides, { userPoolName: 'test', usernameAttributes: [] });
     });
   });
 });
diff --git a/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.ts b/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.ts
index 4fbd40c087e..185d2e58a42 100644
--- a/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.ts
+++ b/packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.ts
@@ -64,9 +64,6 @@ const getPasswordPolicyOverrides = (passwordPolicy: Partial<PasswordPolicyType>)
   for (const key of Object.keys(passwordPolicy)) {
     const typedKey: keyof PasswordPolicyType = key as keyof PasswordPolicyType;
     if (passwordPolicy[typedKey] !== undefined) {
-      if (passwordPolicy[typedKey] === DEFAULT_PASSWORD_SETTINGS[typedKey]) {
-        continue;
-      }
       policyOverrides[passwordOverridePath(typedKey)] = passwordPolicy[typedKey];
     }
   }
@@ -78,12 +75,12 @@ const getUserPoolOverrides = (userPool: UserPoolType): Partial<PolicyOverrides>
   Object.assign(userPoolOverrides, getPasswordPolicyOverrides(userPool.Policies?.PasswordPolicy ?? {}));
   if (userPool.Name) {
     const userNamePolicy: Partial<PolicyOverrides> = {
-      UserPoolName: userPool.Name,
+      userPoolName: userPool.Name,
     };
     Object.assign(userPoolOverrides, userNamePolicy);
   }
   if (userPool.UsernameAttributes === undefined || userPool.UsernameAttributes.length === 0) {
-    userPoolOverrides.UsernameAttributes = [];
+    userPoolOverrides.usernameAttributes = [];
   }
   return userPoolOverrides;
 };
diff --git a/packages/amplify-gen1-codegen-data-adapter/CHANGELOG.md b/packages/amplify-gen1-codegen-data-adapter/CHANGELOG.md
new file mode 100644
index 00000000000..0002dd0f954
--- /dev/null
+++ b/packages/amplify-gen1-codegen-data-adapter/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## 0.0.2-gen2-migrations-test.0 (2024-09-23)
+
+
+### Bug Fixes
+
+* make gen2 migration packages public ([a7832cb](https://github.com/aws-amplify/amplify-cli/commit/a7832cb622cabf3eec3f770393477256117ea47d))
diff --git a/packages/amplify-gen1-codegen-data-adapter/package.json b/packages/amplify-gen1-codegen-data-adapter/package.json
index 233f0094abf..39dcd56d2ef 100644
--- a/packages/amplify-gen1-codegen-data-adapter/package.json
+++ b/packages/amplify-gen1-codegen-data-adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-gen1-codegen-data-adapter",
-  "version": "0.0.1",
+  "version": "0.0.2-gen2-migrations-test.0",
   "type": "commonjs",
   "main": "lib/index.js",
   "devDependencies": {
@@ -8,7 +8,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-amplify/amplify-gen2-codegen": "^0.0.1",
+    "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0",
     "@aws-amplify/auth-construct": "^1.1.5",
     "@aws-sdk/client-amplify": "^3.592.0",
     "@aws-sdk/client-cloudformation": "^3.592.0",
@@ -38,6 +38,9 @@
     ],
     "collectCoverage": true
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "pretest": "mkdir -p coverage",
     "test": "jest --logHeapUsage",
diff --git a/packages/amplify-gen1-codegen-function-adapter/CHANGELOG.md b/packages/amplify-gen1-codegen-function-adapter/CHANGELOG.md
new file mode 100644
index 00000000000..23c509c4a38
--- /dev/null
+++ b/packages/amplify-gen1-codegen-function-adapter/CHANGELOG.md
@@ -0,0 +1,22 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0-gen2-migrations-test.0 (2024-09-23)
+
+
+### Bug Fixes
+
+* make gen2 migration packages public ([a7832cb](https://github.com/aws-amplify/amplify-cli/commit/a7832cb622cabf3eec3f770393477256117ea47d))
+
+
+### Features
+
+* added functions codegen ([b88f2e2](https://github.com/aws-amplify/amplify-cli/commit/b88f2e2733940af6910af132b82af28912b26dcc))
+* added functions codegen ([5120ab4](https://github.com/aws-amplify/amplify-cli/commit/5120ab4d5bcb30793f9ab4b42aec5a40a1ba2974))
+* fixed lint and ran yarn extract-api ([b4f256c](https://github.com/aws-amplify/amplify-cli/commit/b4f256c3b433a38974f7a8612505d1c7c21befeb))
+* functions codegeb ([ba3babf](https://github.com/aws-amplify/amplify-cli/commit/ba3babfb1403e8f740e1cfbf795707cdd085612f))
+* updated API.md for amplify-gen1-codegen-function-adapter ([86c0e5e](https://github.com/aws-amplify/amplify-cli/commit/86c0e5efd6e61564089d546a86ed0b0fe7d653d1))
+* updated functions codegen ([bc1acfa](https://github.com/aws-amplify/amplify-cli/commit/bc1acfa9ee8d78e31c3dcb0ec25d0672b0dab1c4))
+* updated functions codegen ([4ac9324](https://github.com/aws-amplify/amplify-cli/commit/4ac932478633274e87524aea9eb9f48d3640d36c))
diff --git a/packages/amplify-gen1-codegen-function-adapter/package.json b/packages/amplify-gen1-codegen-function-adapter/package.json
index f4190709137..aee12f247c5 100644
--- a/packages/amplify-gen1-codegen-function-adapter/package.json
+++ b/packages/amplify-gen1-codegen-function-adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-gen1-codegen-function-adapter",
-  "version": "0.0.1",
+  "version": "0.1.0-gen2-migrations-test.0",
   "type": "commonjs",
   "main": "lib/index.js",
   "devDependencies": {
@@ -8,7 +8,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-amplify/amplify-gen2-codegen": "^0.0.1",
+    "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0",
     "@aws-sdk/client-lambda": "^3.637.0"
   },
   "jest": {
@@ -34,6 +34,9 @@
     ],
     "collectCoverage": true
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "pretest": "mkdir -p coverage",
     "test": "jest --logHeapUsage",
diff --git a/packages/amplify-gen1-codegen-storage-adapter/API.md b/packages/amplify-gen1-codegen-storage-adapter/API.md
index 389f3daffe7..870021189c7 100644
--- a/packages/amplify-gen1-codegen-storage-adapter/API.md
+++ b/packages/amplify-gen1-codegen-storage-adapter/API.md
@@ -4,13 +4,15 @@
 
 ```ts
 
+import { Lambda } from '@aws-amplify/amplify-gen2-codegen';
 import { StorageRenderParameters } from '@aws-amplify/amplify-gen2-codegen';
+import { StorageTriggerEvent } from '@aws-amplify/amplify-gen2-codegen';
 
 // @public (undocumented)
 export type CLIV1Permission = 'READ' | 'CREATE_AND_UPDATE' | 'DELETE';
 
 // @public (undocumented)
-export const getStorageDefinition: ({ bucketName, cliInputs }: StorageInputs) => StorageRenderParameters;
+export const getStorageDefinition: ({ bucketName, cliInputs, triggers }: StorageInputs) => StorageRenderParameters;
 
 // @public (undocumented)
 export type StorageCLIInputsJSON = {
@@ -28,6 +30,7 @@ export type StorageCLIInputsJSON = {
 export type StorageInputs = {
     bucketName: string;
     cliInputs: StorageCLIInputsJSON;
+    triggers?: Partial<Record<StorageTriggerEvent, Lambda>>;
 };
 
 // (No @packageDocumentation comment for this package)
diff --git a/packages/amplify-gen1-codegen-storage-adapter/CHANGELOG.md b/packages/amplify-gen1-codegen-storage-adapter/CHANGELOG.md
new file mode 100644
index 00000000000..02741ee3565
--- /dev/null
+++ b/packages/amplify-gen1-codegen-storage-adapter/CHANGELOG.md
@@ -0,0 +1,18 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0-gen2-migrations-test.0 (2024-09-23)
+
+
+### Bug Fixes
+
+* make gen2 migration packages public ([a7832cb](https://github.com/aws-amplify/amplify-cli/commit/a7832cb622cabf3eec3f770393477256117ea47d))
+* resolve workflow errors ([aad8b48](https://github.com/aws-amplify/amplify-cli/commit/aad8b486809a49b38c39570047418aa4c808bf70))
+
+
+### Features
+
+* **cli:** initial migration merge ([#13856](https://github.com/aws-amplify/amplify-cli/issues/13856)) ([ebe5cd0](https://github.com/aws-amplify/amplify-cli/commit/ebe5cd046cfb18c38ffdce17610ed3a133cc9d44))
+* storage codegen ([9e45af9](https://github.com/aws-amplify/amplify-cli/commit/9e45af9c881572ce67d5bad7e05e057609c80b00))
diff --git a/packages/amplify-gen1-codegen-storage-adapter/package.json b/packages/amplify-gen1-codegen-storage-adapter/package.json
index 2e1f921e41d..d0c47930b6a 100644
--- a/packages/amplify-gen1-codegen-storage-adapter/package.json
+++ b/packages/amplify-gen1-codegen-storage-adapter/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@aws-amplify/amplify-gen1-codegen-storage-adapter",
-  "version": "0.0.1",
+  "version": "0.1.0-gen2-migrations-test.0",
   "type": "commonjs",
   "main": "lib/index.js",
   "dependencies": {
-    "@aws-amplify/amplify-gen2-codegen": "^0.0.1",
+    "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0",
     "@aws-sdk/client-amplify": "^3.592.0",
     "@aws-sdk/client-cognito-identity": "^3.592.0",
     "@aws-sdk/client-cognito-identity-provider": "^3.592.0",
@@ -37,6 +37,9 @@
     ],
     "collectCoverage": true
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "pretest": "mkdir -p coverage",
     "test": "jest --logHeapUsage",
diff --git a/packages/amplify-gen1-codegen-storage-adapter/src/gen1_storage_codegen_adapter.ts b/packages/amplify-gen1-codegen-storage-adapter/src/gen1_storage_codegen_adapter.ts
index f131943f56e..0365f6c1d06 100644
--- a/packages/amplify-gen1-codegen-storage-adapter/src/gen1_storage_codegen_adapter.ts
+++ b/packages/amplify-gen1-codegen-storage-adapter/src/gen1_storage_codegen_adapter.ts
@@ -1,13 +1,15 @@
-import { StorageRenderParameters } from '@aws-amplify/amplify-gen2-codegen';
+import { StorageTriggerEvent, Lambda, StorageRenderParameters } from '@aws-amplify/amplify-gen2-codegen';
 import { StorageCLIInputsJSON, getStorageAccess } from './storage_access';
 
 export type StorageInputs = {
   bucketName: string;
   cliInputs: StorageCLIInputsJSON;
+  triggers?: Partial<Record<StorageTriggerEvent, Lambda>>;
 };
-export const getStorageDefinition = ({ bucketName, cliInputs }: StorageInputs): StorageRenderParameters => {
+export const getStorageDefinition = ({ bucketName, cliInputs, triggers }: StorageInputs): StorageRenderParameters => {
   return {
     accessPatterns: getStorageAccess(cliInputs),
     storageIdentifier: bucketName,
+    triggers: triggers ?? {},
   };
 };
diff --git a/packages/amplify-gen2-codegen/API.md b/packages/amplify-gen2-codegen/API.md
index 8543db892cf..c6da4e52715 100644
--- a/packages/amplify-gen2-codegen/API.md
+++ b/packages/amplify-gen2-codegen/API.md
@@ -4,6 +4,8 @@
 
 ```ts
 
+import { BucketAccelerateStatus } from '@aws-sdk/client-s3';
+import { BucketVersioningStatus } from '@aws-sdk/client-s3';
 import { EnvironmentResponse } from '@aws-sdk/client-lambda';
 import { PasswordPolicyType } from '@aws-sdk/client-cognito-identity-provider';
 import { Runtime } from '@aws-sdk/client-lambda';
@@ -218,16 +220,22 @@ export type StandardAttributes = Partial<Record<Attribute, StandardAttribute>>;
 
 // @public (undocumented)
 export interface StorageRenderParameters {
+    // (undocumented)
+    accelerateConfiguration?: BucketAccelerateStatus;
     // (undocumented)
     accessPatterns?: AccessPatterns;
     // (undocumented)
     bucketEncryptionAlgorithm?: string;
     // (undocumented)
+    dynamoDB?: string;
+    // (undocumented)
     lambdas?: S3TriggerDefinition[];
     // (undocumented)
     storageIdentifier?: string;
     // (undocumented)
     triggers?: Partial<Record<StorageTriggerEvent, Lambda>>;
+    // (undocumented)
+    versioningConfiguration?: BucketVersioningStatus;
 }
 
 // @public (undocumented)
diff --git a/packages/amplify-gen2-codegen/CHANGELOG.md b/packages/amplify-gen2-codegen/CHANGELOG.md
new file mode 100644
index 00000000000..9f01473aead
--- /dev/null
+++ b/packages/amplify-gen2-codegen/CHANGELOG.md
@@ -0,0 +1,85 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0-gen2-migrations-test.0 (2024-09-23)
+
+
+### Bug Fixes
+
+* add attribute mapping for external providers ([4f4d9fd](https://github.com/aws-amplify/amplify-cli/commit/4f4d9fd261eefbaca6bd3a563b03e59573869e91))
+* add relevant removed code due to incorrect merge ([fe1ab64](https://github.com/aws-amplify/amplify-cli/commit/fe1ab6430a668fb55e280552cb358ae97503d002))
+* add test cases for source builder and synthesizer ([c7bb106](https://github.com/aws-amplify/amplify-cli/commit/c7bb10681a1cbdd1e92eebcc81357399cf681362))
+* add test cases for source builder and synthesizer ([94e1a0e](https://github.com/aws-amplify/amplify-cli/commit/94e1a0e25ac33a42ebd960ae2bcaebea746bd4b7))
+* bugfixes for data codegen ([#13880](https://github.com/aws-amplify/amplify-cli/issues/13880)) ([263cd85](https://github.com/aws-amplify/amplify-cli/commit/263cd85da1acb689e647db42fe0bf176da036cb5))
+* correct package versions; remove unused import ([2855e28](https://github.com/aws-amplify/amplify-cli/commit/2855e28744bc0d319ff85d7a7a1a36d5fbdad253))
+* extract api ([6f4c58b](https://github.com/aws-amplify/amplify-cli/commit/6f4c58b947fa3be4c2c7c200484fa46b6823bb30))
+* fixed warnings in API.md ([49ed426](https://github.com/aws-amplify/amplify-cli/commit/49ed4269c77927dad85fa805174249ac6b1f2ac6))
+* lint spellcheck and unexpected any error ([5b85e96](https://github.com/aws-amplify/amplify-cli/commit/5b85e96ae87ab3278313010a8b0837b61cac37d7))
+* make gen2 migration packages public ([a7832cb](https://github.com/aws-amplify/amplify-cli/commit/a7832cb622cabf3eec3f770393477256117ea47d))
+* **migrate:** convert to gen2 app ([abeb9c9](https://github.com/aws-amplify/amplify-cli/commit/abeb9c9863c6aa78dde0f5b10228537f1038c9b1))
+* remove unnecessary log statement ([c3943b0](https://github.com/aws-amplify/amplify-cli/commit/c3943b0a8ad191af5a8b5f0c8928934641663cb9))
+* resolve extract-api warnings and add saml to dict ([60d2ac9](https://github.com/aws-amplify/amplify-cli/commit/60d2ac94878b76ac7627ea01c51058cbc42324ef))
+* resolve failing test error ([c28e4f9](https://github.com/aws-amplify/amplify-cli/commit/c28e4f9418d6f6b9139b5c0907c2b76f723d7311))
+* resolve incorrect mfaconifg option ([5f1dd79](https://github.com/aws-amplify/amplify-cli/commit/5f1dd79bbebab1616a5752524d2ecb0ec255fd1a))
+* resolve lint and extract-api errors ([e924e3f](https://github.com/aws-amplify/amplify-cli/commit/e924e3f871e1c58767c2088c0fa8b9dc1cbfb7ec))
+* resolve test errors ([6e72ab4](https://github.com/aws-amplify/amplify-cli/commit/6e72ab4b3db6cfb52dc72fbea2651874402c81ba))
+* resolve test errors ([a555585](https://github.com/aws-amplify/amplify-cli/commit/a555585455623fbc8fbd19cfb54eb47b14fa56ef))
+* resolve workflow errors ([b2e96ea](https://github.com/aws-amplify/amplify-cli/commit/b2e96ea522810edcd4acc69a0b1fe2dc203edba7))
+* resolve workflow errors ([aad8b48](https://github.com/aws-amplify/amplify-cli/commit/aad8b486809a49b38c39570047418aa4c808bf70))
+* resolve workflow errors ([1d5be0a](https://github.com/aws-amplify/amplify-cli/commit/1d5be0a175f1053a6302dd2c1c7032fa75356f83))
+* yarn extract-api changes ([e0a33e3](https://github.com/aws-amplify/amplify-cli/commit/e0a33e3f3db6f7d8426b481a081807e6c17391d7))
+
+
+### Features
+
+* add comments to gen1 triggers ([#13866](https://github.com/aws-amplify/amplify-cli/issues/13866)) ([2ec9470](https://github.com/aws-amplify/amplify-cli/commit/2ec947084a89bb000f2b34cc2662121e8cf04fb6))
+* added custom attributes codegen ([0b44538](https://github.com/aws-amplify/amplify-cli/commit/0b445387e45faaa851df93d76cdcdddb6b55f8fe))
+* added custom attributes codegen ([2be715c](https://github.com/aws-amplify/amplify-cli/commit/2be715c9acca312c760e4fd70b519fea14256ea9))
+* added functions auth ([50dc7a2](https://github.com/aws-amplify/amplify-cli/commit/50dc7a20e43898b964df824a0a91d1d3b182a461))
+* added functions auth ([46d8524](https://github.com/aws-amplify/amplify-cli/commit/46d8524f78d04de802e770276021ec0b2b25a73d))
+* added functions auth ([263bc8a](https://github.com/aws-amplify/amplify-cli/commit/263bc8a46666fa845b2bee28d71f07d95f937002))
+* added functions codegen ([80580ce](https://github.com/aws-amplify/amplify-cli/commit/80580ce9560273af0983b65c5a8134cadfc5a869))
+* added functions codegen ([8b679a6](https://github.com/aws-amplify/amplify-cli/commit/8b679a64f20d30f7399302c17599538589381a4d))
+* added functions codegen ([b9080ec](https://github.com/aws-amplify/amplify-cli/commit/b9080ecafae25390b05aaf37326fa38cb8640c6b))
+* bucket versioning override codegen ([c14156d](https://github.com/aws-amplify/amplify-cli/commit/c14156d4fed0514b0bf7ed6f885bac0419f3dcb2))
+* **cli:** initial migration merge ([f803827](https://github.com/aws-amplify/amplify-cli/commit/f8038278b95d321aef4ff75b1bd5a604815fc821))
+* **cli:** initial migration merge ([#13856](https://github.com/aws-amplify/amplify-cli/issues/13856)) ([ebe5cd0](https://github.com/aws-amplify/amplify-cli/commit/ebe5cd046cfb18c38ffdce17610ed3a133cc9d44))
+* configure username codegen ([f032b76](https://github.com/aws-amplify/amplify-cli/commit/f032b762c870b8d50729ab044eeae87be880606e))
+* configure username codegen ([b06eb18](https://github.com/aws-amplify/amplify-cli/commit/b06eb1848ffe52d963448ae43a7c8d286edf4953))
+* fixed failing test ([61dbbac](https://github.com/aws-amplify/amplify-cli/commit/61dbbac8ad39d7d288881a438a6881bf6cdf0e87))
+* fixed lint and ran yarn extract-api ([b4f256c](https://github.com/aws-amplify/amplify-cli/commit/b4f256c3b433a38974f7a8612505d1c7c21befeb))
+* friendly userpool name codegen ([b03e5b0](https://github.com/aws-amplify/amplify-cli/commit/b03e5b03ab7fc0a70ff3981b1232c61edc0fc3a3))
+* friendly userpool name codegen ([3057f69](https://github.com/aws-amplify/amplify-cli/commit/3057f696f3aa000073c2a64a1e83e1ac985256c3))
+* functions codegeb ([ba3babf](https://github.com/aws-amplify/amplify-cli/commit/ba3babfb1403e8f740e1cfbf795707cdd085612f))
+* oauth flows codegen ([8858ef9](https://github.com/aws-amplify/amplify-cli/commit/8858ef92d2f005d6ebe5363e8bb8696a9a72e8ed))
+* oauth flows codegen ([7e0d535](https://github.com/aws-amplify/amplify-cli/commit/7e0d53591d8acb78a05e23ffcb75545d8f08a84f))
+* oauth scopes codegen ([a0edbc1](https://github.com/aws-amplify/amplify-cli/commit/a0edbc1af025ed6058ed9098da240a05f68384f2))
+* oauth scopes codegen ([6ad8080](https://github.com/aws-amplify/amplify-cli/commit/6ad808008f74941644500bd71bcbefeebaf9afd9))
+* oidc/saml external providers codegen ([f248955](https://github.com/aws-amplify/amplify-cli/commit/f2489550925e2f90a53a7d0f833d53571a546ae1))
+* oidc/saml external providers codegen ([66df938](https://github.com/aws-amplify/amplify-cli/commit/66df938e01827a5c3ca96be9be9bd6fe42841b02))
+* read/write permissions for attributes codegen ([36021a3](https://github.com/aws-amplify/amplify-cli/commit/36021a35ec554682c4aca0b32d5a82d85c04f749))
+* read/write permissions for attributes codegen ([7a84af5](https://github.com/aws-amplify/amplify-cli/commit/7a84af5639af1a21dd9d90176d4dde5eb526bb9a))
+* signup user attributes/groups auth codegen ([bacb17b](https://github.com/aws-amplify/amplify-cli/commit/bacb17b29f3bd55ac9d28b55903d4091a5786b15))
+* signup user attributes/groups auth codegen ([772b3e6](https://github.com/aws-amplify/amplify-cli/commit/772b3e66cd4e1413daf33e3477feadce7f1a2da5))
+* social auth codegen ([96cc8d5](https://github.com/aws-amplify/amplify-cli/commit/96cc8d580b39ba80745fd235bd00f2b724962adc))
+* storage codegen ([da810f0](https://github.com/aws-amplify/amplify-cli/commit/da810f0168db87be03aab4ba409947c0214f2d42))
+* storage codegen ([83da5fe](https://github.com/aws-amplify/amplify-cli/commit/83da5fea6a06d3c49678799c579ebb5103eb4cca))
+* storage codegen ([a61100e](https://github.com/aws-amplify/amplify-cli/commit/a61100edf2357d18aec8a462a18e0448d659fdb8))
+* storage codegen ([dade8f2](https://github.com/aws-amplify/amplify-cli/commit/dade8f2f9284a7f4f6dae949f1311cf31f100400))
+* storage codegen ([9e45af9](https://github.com/aws-amplify/amplify-cli/commit/9e45af9c881572ce67d5bad7e05e057609c80b00))
+* storage triggers ([#13869](https://github.com/aws-amplify/amplify-cli/issues/13869)) ([3847399](https://github.com/aws-amplify/amplify-cli/commit/38473994e563cd90452ecc50639ea056bb8dd039))
+* unauthenticated logins codegen ([2d0b700](https://github.com/aws-amplify/amplify-cli/commit/2d0b700f099ceb36b70ab0745a562bcdd5f5ce4b))
+* unauthenticated logins codegen ([6f83374](https://github.com/aws-amplify/amplify-cli/commit/6f8337453da7d9889784836452629a5f35d92e0e))
+* update functions codegen ([dc027e9](https://github.com/aws-amplify/amplify-cli/commit/dc027e9030dfd9085451748bf8d9bde76753da44))
+* update functions codegen ([411511d](https://github.com/aws-amplify/amplify-cli/commit/411511d463ba1cccabcf179319eddff06f535c51))
+* update functions codegen ([bfd4be7](https://github.com/aws-amplify/amplify-cli/commit/bfd4be7787e465e02645d60d1caa403fbfa31961))
+* update functions codegen ([47358bd](https://github.com/aws-amplify/amplify-cli/commit/47358bdaa35e807cde5487f236bd54ac992ad96d))
+* update functions codegen ([1ef8938](https://github.com/aws-amplify/amplify-cli/commit/1ef89380028856e39cfcb2b55e8fd1bd7f6e41ed))
+* updated functions codegen ([1e82262](https://github.com/aws-amplify/amplify-cli/commit/1e822625a7058a8e1f251ccab9f96e8661c2d838))
+* updated functions codegen ([bc1acfa](https://github.com/aws-amplify/amplify-cli/commit/bc1acfa9ee8d78e31c3dcb0ec25d0672b0dab1c4))
+* updated functions codegen ([c2c5969](https://github.com/aws-amplify/amplify-cli/commit/c2c5969f083abc4d3701c03403b9873e0fe4e717))
+* updated functions codegen ([5a8819b](https://github.com/aws-amplify/amplify-cli/commit/5a8819bbb014dd482cac1af30d685d92c7fa5fea))
+* updated functions codegen ([4ac9324](https://github.com/aws-amplify/amplify-cli/commit/4ac932478633274e87524aea9eb9f48d3640d36c))
+* updated secret code ([f54457b](https://github.com/aws-amplify/amplify-cli/commit/f54457b8280e4736ea84786f5879206d7eeed571))
diff --git a/packages/amplify-gen2-codegen/package.json b/packages/amplify-gen2-codegen/package.json
index 06916fa159a..af835fd96de 100644
--- a/packages/amplify-gen2-codegen/package.json
+++ b/packages/amplify-gen2-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-gen2-codegen",
-  "version": "0.0.1",
+  "version": "0.1.0-gen2-migrations-test.0",
   "main": "lib/index.js",
   "type": "commonjs",
   "scripts": {
@@ -33,13 +33,17 @@
     ],
     "collectCoverage": true
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "author": "",
   "license": "Apache-2.0",
   "description": "",
   "dependencies": {
     "@aws-amplify/auth-construct": "^1.1.5",
     "@aws-sdk/client-cognito-identity-provider": "^3.592.0",
-    "@aws-sdk/client-lambda": "^3.637.0",
+    "@aws-sdk/client-lambda": "^3.651.1",
+    "@aws-sdk/client-s3": "^3.651.1",
     "aws-cdk-lib": "^2.127.0",
     "typescript": "^5.4.5"
   },
diff --git a/packages/amplify-gen2-codegen/src/auth/source_builder.ts b/packages/amplify-gen2-codegen/src/auth/source_builder.ts
index aa378479e81..96e24ba9c88 100644
--- a/packages/amplify-gen2-codegen/src/auth/source_builder.ts
+++ b/packages/amplify-gen2-codegen/src/auth/source_builder.ts
@@ -221,7 +221,20 @@ function createOidcSamlPropertyAssignments(
   });
 }
 
-function createExternalProvidersPropertyAssignment(loginOptions: LoginOptions, callbackUrls?: string[], logoutUrls?: string[]) {
+function createSecretErrorStatements(secretVariables: string[]): ts.Node[] {
+  return secretVariables.map((secret) =>
+    factory.createCallExpression(factory.createIdentifier('throw new Error'), undefined, [
+      factory.createStringLiteral(`Secrets need to be reset, use \`npx ampx sandbox secret ${secret}\` to set the value`),
+    ]),
+  );
+}
+
+function createExternalProvidersPropertyAssignment(
+  loginOptions: LoginOptions,
+  callbackUrls?: string[],
+  logoutUrls?: string[],
+  secretErrors?: ts.Node[],
+) {
   const providerAssignments: PropertyAssignment[] = [];
 
   if (loginOptions.googleLogin) {
@@ -235,6 +248,7 @@ function createExternalProvidersPropertyAssignment(loginOptions: LoginOptions, c
         loginOptions.googleAttributes,
       ),
     );
+    secretErrors?.push(...createSecretErrorStatements([googleClientID, googleClientSecret]));
   }
 
   if (loginOptions.appleLogin) {
@@ -250,6 +264,7 @@ function createExternalProvidersPropertyAssignment(loginOptions: LoginOptions, c
         loginOptions.appleAttributes,
       ),
     );
+    secretErrors?.push(...createSecretErrorStatements([appleClientID, appleKeyId, applePrivateKey, appleTeamID]));
   }
 
   if (loginOptions.amazonLogin) {
@@ -263,6 +278,7 @@ function createExternalProvidersPropertyAssignment(loginOptions: LoginOptions, c
         loginOptions.amazonAttributes,
       ),
     );
+    secretErrors?.push(...createSecretErrorStatements([amazonClientID, amazonClientSecret]));
   }
 
   if (loginOptions.facebookLogin) {
@@ -276,6 +292,7 @@ function createExternalProvidersPropertyAssignment(loginOptions: LoginOptions, c
         loginOptions.facebookAttributes,
       ),
     );
+    secretErrors?.push(...createSecretErrorStatements([facebookClientID, facebookClientSecret]));
   }
 
   if (loginOptions.samlLogin) {
@@ -314,6 +331,7 @@ function createExternalProvidersPropertyAssignment(loginOptions: LoginOptions, c
         ),
       ),
     );
+    secretErrors?.push(...createSecretErrorStatements([oidcClientID, oidcClientSecret]));
   }
 
   if (loginOptions.scopes) {
@@ -340,7 +358,7 @@ function createExternalProvidersPropertyAssignment(loginOptions: LoginOptions, c
   return factory.createObjectLiteralExpression(properties, true);
 }
 
-function createLogInWithPropertyAssignment(logInDefinition: LoginOptions = {}) {
+function createLogInWithPropertyAssignment(logInDefinition: LoginOptions = {}, secretErrors: ts.Node[]) {
   const logInWith = factory.createIdentifier('loginWith');
   const assignments: ts.ObjectLiteralElementLike[] = [];
   if (logInDefinition.email === true) {
@@ -388,7 +406,7 @@ function createLogInWithPropertyAssignment(logInDefinition: LoginOptions = {}) {
     assignments.push(
       factory.createPropertyAssignment(
         factory.createIdentifier('externalProviders'),
-        createExternalProvidersPropertyAssignment(logInDefinition, logInDefinition.callbackURLs, logInDefinition.logoutURLs),
+        createExternalProvidersPropertyAssignment(logInDefinition, logInDefinition.callbackURLs, logInDefinition.logoutURLs, secretErrors),
       ),
     );
   }
@@ -442,10 +460,12 @@ const createUserAttributeAssignments = (
 };
 
 export function renderAuthNode(definition: AuthDefinition): ts.NodeArray<ts.Node> {
-  const namedImports = [];
+  const namedImports: { [importedPackageName: string]: Set<string> } = { '@aws-amplify/backend': new Set() };
+  namedImports['@aws-amplify/backend'].add('defineAuth');
   const defineAuthProperties: Array<PropertyAssignment> = [];
+  const secretErrors: ts.Node[] = [];
 
-  const logInWithPropertyAssignment = createLogInWithPropertyAssignment(definition.loginOptions);
+  const logInWithPropertyAssignment = createLogInWithPropertyAssignment(definition.loginOptions, secretErrors);
   defineAuthProperties.push(logInWithPropertyAssignment);
 
   if (definition.customUserAttributes || definition.standardUserAttributes) {
@@ -463,14 +483,27 @@ export function renderAuthNode(definition: AuthDefinition): ts.NodeArray<ts.Node
 
   const hasFunctions = definition.lambdaTriggers && Object.keys(definition.lambdaTriggers).length > 0;
   const { loginOptions } = definition;
-  if (loginOptions?.appleLogin || loginOptions?.amazonLogin || loginOptions?.googleLogin || loginOptions?.facebookLogin) {
-    namedImports.push('secret');
+  if (
+    loginOptions?.appleLogin ||
+    loginOptions?.amazonLogin ||
+    loginOptions?.googleLogin ||
+    loginOptions?.facebookLogin ||
+    (loginOptions?.oidcLogin && loginOptions.oidcLogin.length > 0) ||
+    loginOptions?.samlLogin
+  ) {
+    namedImports['@aws-amplify/backend'].add('secret');
   }
   if (hasFunctions) {
     assert(definition.lambdaTriggers);
     defineAuthProperties.push(createTriggersProperty(definition.lambdaTriggers));
+    for (const value of Object.values(definition.lambdaTriggers)) {
+      const functionName = value.source.split('/')[3];
+      if (!namedImports[`./${functionName}/resource`]) {
+        namedImports[`./${functionName}/resource`] = new Set();
+      }
+      namedImports[`./${functionName}/resource`].add(functionName);
+    }
   }
-
   if (definition.mfa) {
     const multifactorProperties = [
       factory.createPropertyAssignment(factory.createIdentifier('mode'), factory.createStringLiteral(definition.mfa.mode)),
@@ -507,6 +540,6 @@ export function renderAuthNode(definition: AuthDefinition): ts.NodeArray<ts.Node
     functionCallParameter: factory.createObjectLiteralExpression(defineAuthProperties, true),
     additionalImportedBackendIdentifiers: namedImports,
     backendFunctionConstruct: 'defineAuth',
-    importedPackageName: '@aws-amplify/backend',
+    postImportStatements: secretErrors,
   });
 }
diff --git a/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts b/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts
index 16e142828cf..135ddf676d6 100644
--- a/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts
+++ b/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts
@@ -26,7 +26,16 @@ describe('BackendRenderer', () => {
         'Policies.PasswordPolicy.RequireLowercase': true,
         'Policies.PasswordPolicy.RequireUppercase': false,
         'Policies.PasswordPolicy.TemporaryPasswordValidityDays': 10,
-        UserPoolName: 'Test_Name',
+        userPoolName: 'Test_Name',
+      };
+      const mappedPolicyType: Record<string, string> = {
+        MinimumLength: 'minimumLength',
+        RequireUppercase: 'requireUppercase',
+        RequireLowercase: 'requireLowercase',
+        RequireNumbers: 'requireNumbers',
+        RequireSymbols: 'requireSymbols',
+        PasswordHistorySize: 'passwordHistorySize',
+        TemporaryPasswordValidityDays: 'temporaryPasswordValidityDays',
       };
       for (const [key, value] of Object.entries(testCases)) {
         it(`renders override for ${key}`, () => {
@@ -40,10 +49,17 @@ describe('BackendRenderer', () => {
             },
           });
           const output = printNodeArray(rendered);
-          if (typeof value === 'string') {
-            assert(output.includes(`cfnUserPool.addPropertyOverride("${key}", "${value}")`));
-          } else {
-            assert(output.includes(`cfnUserPool.addPropertyOverride("${key}", ${value})`));
+          if (key.includes('PasswordPolicy')) {
+            const policyKey = key.split('.')[2];
+            if (value !== undefined && policyKey in mappedPolicyType) {
+              if (typeof value === 'string') assert(output.includes(`cfnUserPool.policies = {passwordPolicy:{${policyKey}:"${value}"}}`));
+            } else if (typeof value === 'number') {
+              assert(output.includes(`cfnUserPool.policies = {passwordPolicy:{${policyKey}:${value}}}`));
+            } else if (typeof value === 'boolean') {
+              assert(output.includes(`cfnUserPool.policies = {passwordPolicy:{${policyKey}:${value}}}`));
+            }
+          } else if (value) {
+            assert(output.includes(`cfnUserPool.${key} = "${value}"`));
           }
         });
       }
@@ -57,10 +73,17 @@ describe('BackendRenderer', () => {
         });
         const output = printNodeArray(rendered);
         for (const [key, value] of Object.entries(testCases)) {
-          if (typeof value === 'string') {
-            assert(output.includes(`cfnUserPool.addPropertyOverride("${key}", "${value}")`));
-          } else {
-            assert(output.includes(`cfnUserPool.addPropertyOverride("${key}", ${value})`));
+          if (key.includes('PasswordPolicy')) {
+            const policyKey = key.split('.')[2];
+            if (value !== undefined && policyKey in mappedPolicyType) {
+              if (typeof value === 'string') assert(output.includes(`cfnUserPool.policies = {passwordPolicy:{${policyKey}:"${value}"}}`));
+            } else if (typeof value === 'number') {
+              assert(output.includes(`cfnUserPool.policies = {passwordPolicy:{${policyKey}:${value}}}`));
+            } else if (typeof value === 'boolean') {
+              assert(output.includes(`cfnUserPool.policies = {passwordPolicy:{${policyKey}:${value}}}`));
+            }
+          } else if (value) {
+            assert(output.includes(`cfnUserPool.${key} = "${value}"`));
           }
         }
       });
@@ -126,7 +149,7 @@ describe('BackendRenderer', () => {
         });
         it(`imports ${resource}`, () => {
           const renderer = new BackendSynthesizer();
-          const rendered = renderer.render({ [resource]: { importFrom } });
+          const rendered = renderer.render({ [resource]: { importFrom, hasS3Bucket: 'bucket_name' } });
           const source = printNodeArray(rendered);
           assert.match(source, importRegex);
         });
@@ -146,6 +169,7 @@ describe('BackendRenderer', () => {
         const rendered = renderer.render({
           storage: {
             importFrom: 'my-storage',
+            hasS3Bucket: 'bucket_name',
           },
         });
         const output = printNodeArray(rendered);
@@ -186,7 +210,7 @@ describe('BackendRenderer', () => {
         const storageImportLocation = 'storage/resource.ts';
         const renderer = new BackendSynthesizer();
         const rendered = renderer.render({
-          storage: { importFrom: storageImportLocation },
+          storage: { importFrom: storageImportLocation, hasS3Bucket: 'bucket_name' },
         });
         const output = printNodeArray(rendered);
         const regex = getImportRegex('storage', storageImportLocation);
diff --git a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts
index e65c6ae987e..711956ae771 100644
--- a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts
+++ b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts
@@ -10,6 +10,8 @@ import ts, {
   VariableStatement,
 } from 'typescript';
 import { PolicyOverrides } from '../auth/source_builder.js';
+import { BucketAccelerateStatus, BucketVersioningStatus } from '@aws-sdk/client-s3';
+import { AccessPatterns } from '../storage/source_builder.js';
 const factory = ts.factory;
 export interface BackendRenderParameters {
   data?: {
@@ -25,7 +27,12 @@ export interface BackendRenderParameters {
   };
   storage?: {
     importFrom: string;
+    dynamoDB?: string;
+    accelerateConfiguration?: BucketAccelerateStatus;
+    versionConfiguration?: BucketVersioningStatus;
+    hasS3Bucket?: string | AccessPatterns | undefined;
   };
+
   function?: {
     importFrom: string;
     functionNamesAndCategories: Map<string, string>;
@@ -36,10 +43,10 @@ export interface BackendRenderParameters {
 }
 
 export class BackendSynthesizer {
-  private createPropertyAccessExpression(propertyPath: string): Expression {
+  private createPropertyAccessExpression(objectIdentifier: Identifier, propertyPath: string): Expression {
     const parts = propertyPath.split('.');
-    let expression: Expression = factory.createIdentifier(parts[0]);
-    for (let i = 1; i < parts.length; i++) {
+    let expression: Expression = objectIdentifier;
+    for (let i = 0; i < parts.length; i++) {
       expression = factory.createPropertyAccessExpression(expression, factory.createIdentifier(parts[i]));
     }
     return expression;
@@ -47,7 +54,7 @@ export class BackendSynthesizer {
 
   private createVariableDeclaration(identifierName: string, propertyPath: string): VariableDeclaration {
     const identifier = factory.createIdentifier(identifierName);
-    const propertyAccessExpression = this.createPropertyAccessExpression(propertyPath);
+    const propertyAccessExpression = this.createPropertyAccessExpression(factory.createIdentifier('backend'), propertyPath);
     return factory.createVariableDeclaration(identifier, undefined, undefined, propertyAccessExpression);
   }
 
@@ -72,23 +79,18 @@ export class BackendSynthesizer {
     return factory.createCallExpression(backendFunctionIdentifier, undefined, [backendFunctionArgs]);
   }
 
-  private createOverrideStatement(
+  private setPropertyValue(
     objectIdentifier: Identifier,
-    propertyName: string,
-    value: number | string | boolean | string[],
+    propertyPath: string,
+    value: number | string | boolean | string[] | object,
   ): ExpressionStatement {
-    const addOverrideIdentifier = factory.createIdentifier('addPropertyOverride');
+    const propertyAccessExpression = this.createPropertyAccessExpression(objectIdentifier, propertyPath);
     const overrideValue = this.getOverrideValue(value);
 
-    return factory.createExpressionStatement(
-      factory.createCallExpression(factory.createPropertyAccessExpression(objectIdentifier, addOverrideIdentifier), undefined, [
-        factory.createStringLiteral(propertyName),
-        overrideValue,
-      ]),
-    );
+    return factory.createExpressionStatement(factory.createAssignment(propertyAccessExpression, overrideValue));
   }
 
-  private getOverrideValue(value: number | string | boolean | string[]): Expression {
+  private getOverrideValue(value: number | string | boolean | string[] | object): Expression {
     if (typeof value === 'number') {
       return factory.createNumericLiteral(value);
     } else if (typeof value === 'string') {
@@ -97,6 +99,13 @@ export class BackendSynthesizer {
       return factory.createArrayLiteralExpression(value.map((item) => factory.createStringLiteral(item)));
     } else if (typeof value === 'boolean') {
       return value ? factory.createTrue() : factory.createFalse();
+    } else if (typeof value === 'object' && value !== null) {
+      const properties: ts.PropertyAssignment[] = [];
+      for (const [key, val] of Object.entries(value)) {
+        const property = factory.createPropertyAssignment(factory.createIdentifier(key), this.getOverrideValue(val));
+        properties.push(property);
+      }
+      return factory.createObjectLiteralExpression(properties, true);
     }
     throw new TypeError(`Unrecognized type: ${typeof value}`);
   }
@@ -112,6 +121,16 @@ export class BackendSynthesizer {
     const defineBackendProperties = [];
     const nodes = [];
 
+    const mappedPolicyType: Record<string, string> = {
+      MinimumLength: 'minimumLength',
+      RequireUppercase: 'requireUppercase',
+      RequireLowercase: 'requireLowercase',
+      RequireNumbers: 'requireNumbers',
+      RequireSymbols: 'requireSymbols',
+      PasswordHistorySize: 'passwordHistorySize',
+      TemporaryPasswordValidityDays: 'temporaryPasswordValidityDays',
+    };
+
     if (renderArgs.auth) {
       imports.push(this.createImportStatement([authFunctionIdentifier], renderArgs.auth.importFrom));
       const auth = factory.createShorthandPropertyAssignment(authFunctionIdentifier);
@@ -124,7 +143,7 @@ export class BackendSynthesizer {
       defineBackendProperties.push(data);
     }
 
-    if (renderArgs.storage) {
+    if (renderArgs.storage?.hasS3Bucket) {
       imports.push(this.createImportStatement([storageFunctionIdentifier], renderArgs.storage.importFrom));
       const storage = factory.createShorthandPropertyAssignment(storageFunctionIdentifier);
       defineBackendProperties.push(storage);
@@ -132,7 +151,6 @@ export class BackendSynthesizer {
 
     if (renderArgs.function) {
       const functionIdentifiers: Identifier[] = [];
-
       const functionNameCategories = renderArgs.function.functionNamesAndCategories;
       for (const [functionName, category] of functionNameCategories) {
         functionIdentifiers.push(factory.createIdentifier(functionName));
@@ -142,6 +160,18 @@ export class BackendSynthesizer {
       }
     }
 
+    if (renderArgs.storage?.dynamoDB) {
+      nodes.push(
+        factory.createThrowStatement(
+          factory.createNewExpression(factory.createIdentifier('Error'), undefined, [
+            factory.createStringLiteral(
+              `DynamoDB table \`${renderArgs.storage.dynamoDB}\` is referenced in your Gen 1 backend and will need to be manually migrated to reference with CDK.`,
+            ),
+          ]),
+        ),
+      );
+    }
+
     imports.push(this.createImportStatement([backendFunctionIdentifier], '@aws-amplify/backend'));
 
     if (renderArgs.unsupportedCategories && renderArgs.unsupportedCategories.categories) {
@@ -173,55 +203,150 @@ export class BackendSynthesizer {
 
     if (renderArgs.auth?.userPoolOverrides) {
       const cfnUserPoolVariableStatement = this.createVariableStatement(
-        this.createVariableDeclaration('cfnUserPool', 'backend.auth.resources.cfnResources.cfnUserPool'),
+        this.createVariableDeclaration('cfnUserPool', 'auth.resources.cfnResources.cfnUserPool'),
       );
       nodes.push(cfnUserPoolVariableStatement);
+      const policies: { passwordPolicy: Record<string, number | string | boolean | string[]> } = {
+        passwordPolicy: {},
+      };
       for (const [overridePath, value] of Object.entries(renderArgs.auth.userPoolOverrides)) {
-        nodes.push(this.createOverrideStatement(factory.createIdentifier('cfnUserPool'), overridePath, value as number | string | boolean));
+        if (overridePath.includes('PasswordPolicy')) {
+          const policyKey = overridePath.split('.')[2];
+          if (value !== undefined && policyKey in mappedPolicyType) {
+            policies.passwordPolicy[mappedPolicyType[policyKey] as string] = value;
+          }
+        } else if (value) {
+          nodes.push(this.setPropertyValue(factory.createIdentifier('cfnUserPool'), overridePath, value));
+        }
       }
+      nodes.push(
+        this.setPropertyValue(
+          factory.createIdentifier('cfnUserPool'),
+          'policies',
+          policies as number | string | boolean | string[] | object,
+        ),
+      );
     }
 
     if (renderArgs.auth?.guestLogin === false) {
       const cfnIdentityPoolVariableStatement = this.createVariableStatement(
-        this.createVariableDeclaration('cfnIdentityPool', 'backend.auth.resources.cfnResources.cfnIdentityPool'),
+        this.createVariableDeclaration('cfnIdentityPool', 'auth.resources.cfnResources.cfnIdentityPool'),
       );
       nodes.push(cfnIdentityPoolVariableStatement);
-      nodes.push(this.createOverrideStatement(factory.createIdentifier('cfnIdentityPool'), 'AllowUnauthenticatedIdentities', false));
+      nodes.push(this.setPropertyValue(factory.createIdentifier('cfnIdentityPool'), 'allowUnauthenticatedIdentities', false));
     }
 
     if (renderArgs.auth?.oAuthFlows || renderArgs.auth?.readAttributes || renderArgs.auth?.writeAttributes) {
       const cfnUserPoolClientVariableStatement = this.createVariableStatement(
-        this.createVariableDeclaration('cfnUserPoolClient', 'backend.auth.resources.cfnResources.cfnUserPoolClient'),
+        this.createVariableDeclaration('cfnUserPoolClient', 'auth.resources.cfnResources.cfnUserPoolClient'),
       );
       nodes.push(cfnUserPoolClientVariableStatement);
       if (renderArgs.auth?.oAuthFlows) {
         nodes.push(
-          this.createOverrideStatement(
+          this.setPropertyValue(
             factory.createIdentifier('cfnUserPoolClient'),
-            'AllowedOAuthFlows',
+            'allowedOAuthFlows',
             renderArgs.auth?.oAuthFlows as number | string | boolean | string[],
           ),
         );
       }
+
       if (renderArgs.auth?.readAttributes) {
         nodes.push(
-          this.createOverrideStatement(
+          this.setPropertyValue(
             factory.createIdentifier('cfnUserPoolClient'),
-            'ReadAttributes',
+            'readAttributes',
             renderArgs.auth?.readAttributes as number | string | boolean | string[],
           ),
         );
       }
     }
+
     if (renderArgs.auth?.writeAttributes) {
       nodes.push(
-        this.createOverrideStatement(
+        this.setPropertyValue(
           factory.createIdentifier('cfnUserPoolClient'),
-          'WriteAttributes',
+          'writeAttributes',
           renderArgs.auth?.writeAttributes as string[],
         ),
       );
     }
+
+    if (renderArgs.storage?.accelerateConfiguration || renderArgs.storage?.versionConfiguration) {
+      const cfnStorageVariableStatement = this.createVariableStatement(
+        this.createVariableDeclaration('s3Bucket', 'storage.resources.bucket'),
+      );
+      nodes.push(cfnStorageVariableStatement);
+      const cfnBucketDeclaration = factory.createVariableDeclaration(
+        factory.createIdentifier('cfnBucket'),
+        undefined,
+        undefined,
+        factory.createAsExpression(
+          factory.createPropertyAccessExpression(
+            factory.createPropertyAccessExpression(factory.createIdentifier('s3Bucket'), factory.createIdentifier('node')),
+            factory.createIdentifier('defaultChild'),
+          ),
+          factory.createTypeReferenceNode(
+            factory.createQualifiedName(factory.createIdentifier('s3'), factory.createIdentifier('CfnBucket')),
+            undefined,
+          ),
+        ),
+      );
+
+      const cfnBucketStatement = factory.createVariableStatement(
+        undefined,
+        factory.createVariableDeclarationList([cfnBucketDeclaration], ts.NodeFlags.Const),
+      );
+
+      if (renderArgs.storage?.accelerateConfiguration) {
+        const accelerateConfigAssignment = factory.createExpressionStatement(
+          factory.createAssignment(
+            factory.createPropertyAccessExpression(
+              factory.createIdentifier('cfnBucket'),
+              factory.createIdentifier('accelerateConfiguration'),
+            ),
+            factory.createObjectLiteralExpression(
+              [
+                factory.createPropertyAssignment(
+                  factory.createIdentifier('accelerationStatus'),
+                  factory.createStringLiteral(renderArgs.storage.accelerateConfiguration),
+                ),
+              ],
+              false,
+            ),
+          ),
+        );
+        nodes.push(cfnBucketStatement, accelerateConfigAssignment);
+      }
+
+      if (renderArgs.storage?.versionConfiguration) {
+        const versionConfigAssignment = factory.createExpressionStatement(
+          factory.createAssignment(
+            factory.createPropertyAccessExpression(
+              factory.createIdentifier('cfnBucket'),
+              factory.createIdentifier('versioningConfiguration'),
+            ),
+            factory.createObjectLiteralExpression(
+              [
+                factory.createPropertyAssignment(
+                  factory.createIdentifier('status'),
+                  factory.createStringLiteral(renderArgs.storage.versionConfiguration),
+                ),
+              ],
+              false,
+            ),
+          ),
+        );
+        nodes.push(versionConfigAssignment);
+      }
+      imports.push(
+        factory.createImportDeclaration(
+          undefined,
+          factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier('s3'))),
+          factory.createStringLiteral('aws-cdk-lib/aws-s3'),
+        ),
+      );
+    }
     return factory.createNodeArray([...imports, ...errors, backendStatement, ...nodes], true);
   }
 }
diff --git a/packages/amplify-gen2-codegen/src/data/source_builder.ts b/packages/amplify-gen2-codegen/src/data/source_builder.ts
index 843eee1daf8..0fc8b960ad7 100644
--- a/packages/amplify-gen2-codegen/src/data/source_builder.ts
+++ b/packages/amplify-gen2-codegen/src/data/source_builder.ts
@@ -14,6 +14,8 @@ export const schemaPlaceholderComment = 'TODO: Add your existing graphql schema
 
 export const generateDataSource = (dataDefinition?: DataDefinition): ts.NodeArray<ts.Node> => {
   const dataRenderProperties: ObjectLiteralElementLike[] = [];
+  const namedImports: Record<string, Set<string>> = { '@aws-amplify/backend': new Set() };
+  namedImports['@aws-amplify/backend'].add('defineData');
 
   if (dataDefinition?.tableMapping) {
     const tableMappingProperties: ObjectLiteralElementLike[] = [];
@@ -45,6 +47,6 @@ export const generateDataSource = (dataDefinition?: DataDefinition): ts.NodeArra
     functionCallParameter: factory.createObjectLiteralExpression(dataRenderProperties, true),
     postExportStatements: [createTodoError('Add Gen 1 GraphQL schema')],
     backendFunctionConstruct: 'defineData',
-    importedPackageName: '@aws-amplify/backend',
+    additionalImportedBackendIdentifiers: namedImports,
   });
 };
diff --git a/packages/amplify-gen2-codegen/src/function/source_builder.ts b/packages/amplify-gen2-codegen/src/function/source_builder.ts
index 2fe0d690283..41d78a541f6 100644
--- a/packages/amplify-gen2-codegen/src/function/source_builder.ts
+++ b/packages/amplify-gen2-codegen/src/function/source_builder.ts
@@ -18,8 +18,9 @@ const createParameter = (name: string, value: ts.LiteralExpression | ts.ObjectLi
   factory.createPropertyAssignment(factory.createIdentifier(name), value);
 
 export function renderFunctions(definition: FunctionDefinition, appId?: string, backendEnvironmentName?: string | undefined) {
-  const groupsComment: ts.Node[] = [];
-  const namedImports: string[] = [];
+  const groupsComment: (ts.CallExpression | ts.JSDoc)[] = [];
+  const namedImports: Record<string, Set<string>> = { '@aws-amplify/backend': new Set() };
+  namedImports['@aws-amplify/backend'].add('defineFunction');
 
   groupsComment.push(
     factory.createJSDocComment(
@@ -40,15 +41,14 @@ export function renderFunctions(definition: FunctionDefinition, appId?: string,
     functionCallParameter: factory.createObjectLiteralExpression(defineFunctionProperty, true),
     backendFunctionConstruct: 'defineFunction',
     additionalImportedBackendIdentifiers: namedImports,
-    importedPackageName: '@aws-amplify/backend',
     postImportStatements: groupsComment,
   });
 }
 
 export function createFunctionDefinition(
   definition?: FunctionDefinition,
-  groupsComment?: ts.Node[],
-  namedImports?: string[],
+  groupsComment?: (ts.CallExpression | ts.JSDoc)[],
+  namedImports?: Record<string, Set<string>>,
   appId?: string,
   backendEnvironmentName?: string,
 ) {
@@ -74,13 +74,18 @@ export function createFunctionDefinition(
         factory.createObjectLiteralExpression(
           Object.entries(definition.environment.Variables).map(([key, value]) => {
             if (key == 'API_KEY' && value.startsWith(`/amplify/${appId}/${backendEnvironmentName}`)) {
-              groupsComment!.push(
+              groupsComment?.push(
                 factory.createCallExpression(factory.createIdentifier('throw new Error'), undefined, [
                   // eslint-disable-next-line spellcheck/spell-checker
                   factory.createStringLiteral('Secrets need to be reset, use `npx ampx sandbox secret set API_KEY` to set the value'),
                 ]),
               );
-              namedImports!.push('secret');
+              if (namedImports && namedImports['@aws-amplify/backend']) {
+                namedImports['@aws-amplify/backend'].add('secret');
+              } else {
+                const namedImports: Record<string, Set<string>> = { '@aws-amplify/backend': new Set() };
+                namedImports['@aws-amplify/backend'].add('secret');
+              }
               return factory.createPropertyAssignment(
                 key,
                 factory.createCallExpression(factory.createIdentifier('secret'), undefined, [factory.createStringLiteral('API_KEY')]),
diff --git a/packages/amplify-gen2-codegen/src/index.ts b/packages/amplify-gen2-codegen/src/index.ts
index 0489305cdc6..2f84fccdb6c 100644
--- a/packages/amplify-gen2-codegen/src/index.ts
+++ b/packages/amplify-gen2-codegen/src/index.ts
@@ -79,10 +79,28 @@ export const createGen2Renderer = ({
     () => patchNpmPackageJson({}),
     (content) => fileWriter(content, path.join(outputDir, 'package.json')),
   );
+  const amplifyTsConfigJson = new JsonRenderer(
+    () => ({
+      compilerOptions: {
+        target: 'es2022',
+        module: 'es2022',
+        moduleResolution: 'bundler',
+        resolveJsonModule: true,
+        esModuleInterop: true,
+        forceConsistentCasingInFileNames: true,
+        strict: true,
+        skipLibCheck: true,
+        paths: {
+          '$amplify/*': ['../.amplify/generated/*'],
+        },
+      },
+    }),
+    (content) => fileWriter(content, path.join(outputDir, 'amplify', 'tsconfig.json')),
+  );
   const backendSynthesizer = new BackendSynthesizer();
   const backendRenderOptions: BackendRenderParameters = {};
 
-  const renderers: Renderer[] = [ensureOutputDir, ensureAmplifyDirectory, amplifyPackageJson, jsonRenderer];
+  const renderers: Renderer[] = [ensureOutputDir, ensureAmplifyDirectory, amplifyPackageJson, amplifyTsConfigJson, jsonRenderer];
 
   if (unsupportedCategories && unsupportedCategories?.size >= 1) {
     backendRenderOptions.unsupportedCategories = {
@@ -90,18 +108,18 @@ export const createGen2Renderer = ({
     };
   }
 
-  if (functions) {
+  if (functions && functions.length) {
     const functionNamesAndCategory = new Map<string, string>();
     for (const func of functions) {
-      if (func.name && func.category) {
+      if (func.name) {
         const splitFunctionName = func.name.split('-')[0];
-        functionNamesAndCategory.set(splitFunctionName, func.category);
-        renderers.push(new EnsureDirectory(path.join(outputDir, 'amplify', func.category || 'function', func.name.split('-')[0])));
+        functionNamesAndCategory.set(splitFunctionName, func.category ?? 'function');
+        renderers.push(new EnsureDirectory(path.join(outputDir, 'amplify', func.category ?? 'function', func.name.split('-')[0])));
         renderers.push(
           new TypescriptNodeArrayRenderer(
-            async () => renderFunctions(func, appId, backendEnvironmentName),
+            async () => renderFunctions(func),
             (content) => {
-              const filePath = path.join(outputDir, 'amplify', func.category || 'function', splitFunctionName);
+              const filePath = path.join(outputDir, 'amplify', func.category ?? 'function', splitFunctionName);
               return fileWriter(content, path.join(filePath, 'resource.ts')).then(() => fileWriter('', path.join(filePath, 'handler.ts')));
             },
           ),
@@ -132,6 +150,7 @@ export const createGen2Renderer = ({
       writeAttributes: auth?.writeAttributes,
     };
   }
+
   if (data) {
     renderers.push(new EnsureDirectory(path.join(outputDir, 'amplify', 'data')));
     renderers.push(
@@ -146,15 +165,22 @@ export const createGen2Renderer = ({
   }
 
   if (storage) {
-    renderers.push(new EnsureDirectory(path.join(outputDir, 'amplify', 'storage')));
-    renderers.push(
-      new TypescriptNodeArrayRenderer(
-        async () => renderStorage(storage),
-        (content) => fileWriter(content, path.join(outputDir, 'amplify', 'storage', 'resource.ts')),
-      ),
-    );
+    const hasS3Bucket = storage?.accessPatterns || storage?.storageIdentifier;
+    if (hasS3Bucket) {
+      renderers.push(new EnsureDirectory(path.join(outputDir, 'amplify', 'storage')));
+      renderers.push(
+        new TypescriptNodeArrayRenderer(
+          async () => renderStorage(storage),
+          (content) => fileWriter(content, path.join(outputDir, 'amplify', 'storage', 'resource.ts')),
+        ),
+      );
+    }
     backendRenderOptions.storage = {
       importFrom: './storage/resource',
+      dynamoDB: storage.dynamoDB,
+      accelerateConfiguration: storage.accelerateConfiguration,
+      versionConfiguration: storage.versioningConfiguration,
+      hasS3Bucket: hasS3Bucket,
     };
   }
 
diff --git a/packages/amplify-gen2-codegen/src/resource/resource.test.ts b/packages/amplify-gen2-codegen/src/resource/resource.test.ts
index 302e0ac756a..71e5461ece5 100644
--- a/packages/amplify-gen2-codegen/src/resource/resource.test.ts
+++ b/packages/amplify-gen2-codegen/src/resource/resource.test.ts
@@ -8,13 +8,14 @@ const factory = ts.factory;
 describe('Resource.ts file generation', () => {
   describe('imports', () => {
     const importedFunctionName = 'helloWorld';
-    const importedPackageName = 'my-hello-world-package';
+    const additionalImportedBackendIdentifiers: Record<string, Set<string>> = { 'my-hello-world-package': new Set() };
+    additionalImportedBackendIdentifiers['my-hello-world-package'].add(importedFunctionName);
     const exportedVariableName = 'goodbyeWorld';
     const render = (parameters?: Partial<ResourceTsParameters>) =>
       printNodeArray(
         renderResourceTsFile({
           backendFunctionConstruct: importedFunctionName,
-          importedPackageName,
+          additionalImportedBackendIdentifiers,
           functionCallParameter: factory.createObjectLiteralExpression(),
           exportedVariableName: factory.createIdentifier(exportedVariableName),
           ...parameters,
@@ -25,13 +26,14 @@ describe('Resource.ts file generation', () => {
     });
     it('calls import with additionally import identifiers', () => {
       const additionalImport = 'aGoodDayToYou';
+      additionalImportedBackendIdentifiers['my-hello-world-package'].add(additionalImport);
       assert.match(
-        render({ additionalImportedBackendIdentifiers: [additionalImport] }),
+        render({ additionalImportedBackendIdentifiers }),
         new RegExp(`import \\{ ${importedFunctionName}, ${additionalImport} \\} from `),
       );
     });
     it('calls import with the correct package name', () => {
-      assert.match(render(), new RegExp(`from "${importedPackageName}";`));
+      assert.match(render(), new RegExp('from\\s+["\']my-hello-world-package["\']'));
     });
     it('makes the function call', () => {
       assert.match(render(), new RegExp(`${importedFunctionName}\\(\\{\\}\\);`));
diff --git a/packages/amplify-gen2-codegen/src/resource/resource.ts b/packages/amplify-gen2-codegen/src/resource/resource.ts
index a7a3eb10853..0fcd2c3a6a8 100644
--- a/packages/amplify-gen2-codegen/src/resource/resource.ts
+++ b/packages/amplify-gen2-codegen/src/resource/resource.ts
@@ -1,8 +1,7 @@
 import ts from 'typescript';
 const factory = ts.factory;
 export type ResourceTsParameters = {
-  additionalImportedBackendIdentifiers?: string[];
-  importedPackageName: string;
+  additionalImportedBackendIdentifiers?: Record<string, Set<string>>;
   backendFunctionConstruct: string;
   functionCallParameter: ts.ObjectLiteralExpression;
   exportedVariableName: ts.Identifier;
@@ -10,16 +9,15 @@ export type ResourceTsParameters = {
   postExportStatements?: ts.Node[];
 };
 export function renderResourceTsFile({
-  additionalImportedBackendIdentifiers = [],
+  additionalImportedBackendIdentifiers = {},
   backendFunctionConstruct,
-  importedPackageName,
   functionCallParameter,
   exportedVariableName,
   postImportStatements,
   postExportStatements,
 }: ResourceTsParameters): ts.NodeArray<ts.Node> {
   const backendFunctionIdentifier = factory.createIdentifier(backendFunctionConstruct);
-  const importStatement = renderImportStatements(backendFunctionIdentifier, additionalImportedBackendIdentifiers, importedPackageName);
+  const importStatements = renderImportStatements(additionalImportedBackendIdentifiers);
   const functionCall = factory.createCallExpression(backendFunctionIdentifier, undefined, [functionCallParameter]);
   const exportedVariable = factory.createVariableDeclaration(exportedVariableName, undefined, undefined, functionCall);
   const exportStatement = factory.createVariableStatement(
@@ -27,12 +25,11 @@ export function renderResourceTsFile({
     factory.createVariableDeclarationList([exportedVariable], ts.NodeFlags.Const),
   );
 
-  return factory.createNodeArray([importStatement, ...(postImportStatements ?? []), exportStatement, ...(postExportStatements ?? [])]);
+  return factory.createNodeArray([...importStatements, ...(postImportStatements ?? []), exportStatement, ...(postExportStatements ?? [])]);
 }
 
 export type ResourceTsParametersList = {
-  additionalImportedBackendIdentifiers?: string[];
-  importedPackageName: string;
+  additionalImportedBackendIdentifiers?: Record<string, Set<string>>;
   backendFunctionConstruct: string;
   functionCallParameter: ts.ObjectLiteralExpression[];
   exportedVariableName: ts.Identifier[];
@@ -41,44 +38,43 @@ export type ResourceTsParametersList = {
 };
 
 export function renderResourceTsFilesForFunction({
-  additionalImportedBackendIdentifiers = [],
+  additionalImportedBackendIdentifiers = {},
   backendFunctionConstruct,
-  importedPackageName,
   functionCallParameter,
   exportedVariableName,
   postImportStatements,
   postExportStatements,
 }: ResourceTsParametersList): ts.NodeArray<ts.Node> {
-  const backendFunctionIdentifier = factory.createIdentifier(backendFunctionConstruct);
-
-  const importStatement = renderImportStatements(backendFunctionIdentifier, additionalImportedBackendIdentifiers, importedPackageName);
+  const importStatements = renderImportStatements(additionalImportedBackendIdentifiers);
   const exportStatements = renderExportStatementsForFunctions(backendFunctionConstruct, functionCallParameter, exportedVariableName);
 
   return factory.createNodeArray([
-    importStatement,
+    ...importStatements,
     ...(postImportStatements ?? []),
     ...(exportStatements ?? []),
     ...(postExportStatements ?? []),
   ]);
 }
 
-function renderImportStatements(
-  backendFunctionIdentifier: ts.Identifier,
-  additionalImportedBackendIdentifiers: string[],
-  importedPackageName: string,
-) {
-  const importSpecifiers = [factory.createImportSpecifier(false, undefined, backendFunctionIdentifier)].concat(
-    additionalImportedBackendIdentifiers.map((importedFunctionName) =>
-      factory.createImportSpecifier(false, undefined, factory.createIdentifier(importedFunctionName)),
-    ),
-  );
-  const importStatement = ts.factory.createImportDeclaration(
-    undefined,
-    factory.createImportClause(false, undefined, factory.createNamedImports(importSpecifiers)),
-    factory.createStringLiteral(importedPackageName),
-  );
+function renderImportStatements(additionalImportedBackendIdentifiers: Record<string, Set<string>>) {
+  const importStatements: ts.ImportDeclaration[] = [];
+  for (const [packageName, identifiers] of Object.entries(additionalImportedBackendIdentifiers)) {
+    const importSpecifiers: ts.ImportSpecifier[] = [];
+
+    identifiers.forEach((identifier) => {
+      importSpecifiers.push(factory.createImportSpecifier(false, undefined, factory.createIdentifier(identifier)));
+    });
+
+    const importStatement = factory.createImportDeclaration(
+      undefined,
+      factory.createImportClause(false, undefined, factory.createNamedImports(importSpecifiers)),
+      factory.createStringLiteral(packageName),
+    );
+
+    importStatements.push(importStatement);
+  }
 
-  return importStatement;
+  return importStatements;
 }
 
 function renderExportStatementsForFunctions(
diff --git a/packages/amplify-gen2-codegen/src/storage/access.ts b/packages/amplify-gen2-codegen/src/storage/access.ts
index fb97466a8ca..3dd4a0a00fc 100644
--- a/packages/amplify-gen2-codegen/src/storage/access.ts
+++ b/packages/amplify-gen2-codegen/src/storage/access.ts
@@ -9,7 +9,7 @@ const factory = ts.factory;
 
 type AccessPath = 'public/*' | 'private/{entity_id}/*' | 'protected/{entity_id}/*';
 
-type UserLevel = 'guest' | 'authenticated';
+type UserLevel = 'guest' | 'authenticated' | `entity('identity')` | `groups(['${string}'])`;
 
 const createAllowPattern = (allowIdentifier: Identifier, userLevel: UserLevel, permissions: Permission[]) => {
   return factory.createCallExpression(
@@ -27,15 +27,22 @@ export const getAccessPatterns = (accessPatterns: AccessPatterns): ts.PropertyAs
   const privatePathAccess = [];
   const protectedPathAccess = [];
 
-  if (accessPatterns.guest) {
+  if (accessPatterns.guest && accessPatterns.guest.length) {
     publicPathAccess.push(createAllowPattern(allowIdentifier, 'guest', accessPatterns.guest ?? []));
   }
-  if (accessPatterns.auth) {
+  if (accessPatterns.auth && accessPatterns.auth.length) {
     const accessPattern = createAllowPattern(allowIdentifier, 'authenticated', accessPatterns.auth ?? []);
     publicPathAccess.push(accessPattern);
     protectedPathAccess.push(accessPattern);
     privatePathAccess.push(accessPattern);
   }
+  if (accessPatterns.groups && Object.keys(accessPatterns.groups).length) {
+    Object.entries(accessPatterns.groups).forEach(([key, value]) => {
+      publicPathAccess.push(createAllowPattern(allowIdentifier, `groups(['${key}'])`, value));
+      privatePathAccess.push(createAllowPattern(allowIdentifier, `groups(['${key}'])`, value));
+      protectedPathAccess.push(createAllowPattern(allowIdentifier, `groups(['${key}'])`, value));
+    });
+  }
 
   const publicPath: AccessPath = 'public/*';
   const privatePath: AccessPath = 'private/{entity_id}/*';
@@ -62,7 +69,7 @@ export const getAccessPatterns = (accessPatterns: AccessPatterns): ts.PropertyAs
     [factory.createParameterDeclaration(undefined, undefined, allowIdentifier)],
     undefined,
     undefined,
-    factory.createParenthesizedExpression(factory.createObjectLiteralExpression(allowAssignments)),
+    factory.createParenthesizedExpression(factory.createObjectLiteralExpression(allowAssignments, true)),
   );
   return factory.createPropertyAssignment(accessIdentifier, accessFunction);
 };
diff --git a/packages/amplify-gen2-codegen/src/storage/source_builder.ts b/packages/amplify-gen2-codegen/src/storage/source_builder.ts
index ed07d0017f0..b987c51cd13 100644
--- a/packages/amplify-gen2-codegen/src/storage/source_builder.ts
+++ b/packages/amplify-gen2-codegen/src/storage/source_builder.ts
@@ -2,6 +2,7 @@ import ts from 'typescript';
 import { getAccessPatterns } from './access';
 import { renderResourceTsFile } from '../resource/resource';
 import { createTriggersProperty, Lambda } from '../function/lambda';
+import { BucketAccelerateStatus, BucketVersioningStatus } from '@aws-sdk/client-s3';
 const factory = ts.factory;
 
 export type S3TriggerDefinition = Record<string, never>;
@@ -23,9 +24,15 @@ export interface StorageRenderParameters {
   storageIdentifier?: string;
   lambdas?: S3TriggerDefinition[];
   bucketEncryptionAlgorithm?: string;
+  dynamoDB?: string;
+  accelerateConfiguration?: BucketAccelerateStatus;
+  versioningConfiguration?: BucketVersioningStatus;
 }
 export const renderStorage = (storageParams: StorageRenderParameters = {}) => {
   const propertyAssignments: ts.PropertyAssignment[] = [];
+  const namedImports: Record<string, Set<string>> = { '@aws-amplify/backend': new Set() };
+  namedImports['@aws-amplify/backend'].add('defineStorage');
+  const triggers = storageParams.triggers || {};
 
   if (storageParams.storageIdentifier) {
     propertyAssignments.push(
@@ -48,15 +55,22 @@ export const renderStorage = (storageParams: StorageRenderParameters = {}) => {
       ),
     );
   }
-  if (storageParams.triggers) {
-    propertyAssignments.push(createTriggersProperty(storageParams.triggers));
+  if (Object.keys(triggers).length) {
+    propertyAssignments.push(createTriggersProperty(triggers));
+    for (const value of Object.values(triggers)) {
+      const functionName = value.source.split('/')[3];
+      if (!namedImports[`./${functionName}/resource`]) {
+        namedImports[`./${functionName}/resource`] = new Set();
+      }
+      namedImports[`./${functionName}/resource`].add(functionName);
+    }
   }
   const storageArgs = factory.createObjectLiteralExpression(propertyAssignments);
   return renderResourceTsFile({
-    importedPackageName: '@aws-amplify/backend',
     backendFunctionConstruct: 'defineStorage',
     exportedVariableName: factory.createIdentifier('storage'),
     functionCallParameter: storageArgs,
     postImportStatements: groupsComment,
+    additionalImportedBackendIdentifiers: namedImports,
   });
 };
diff --git a/packages/amplify-go-function-runtime-provider/CHANGELOG.md b/packages/amplify-go-function-runtime-provider/CHANGELOG.md
index 55aff59e0d7..b7da541d9bc 100644
--- a/packages/amplify-go-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-go-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.48-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-go-function-runtime-provider@2.3.47...amplify-go-function-runtime-provider@2.3.48-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package amplify-go-function-runtime-provider
+
+
+
+
+
 ## [2.3.47](https://github.com/aws-amplify/amplify-cli/compare/amplify-go-function-runtime-provider@2.3.46...amplify-go-function-runtime-provider@2.3.47) (2024-08-02)
 
 
diff --git a/packages/amplify-go-function-runtime-provider/package.json b/packages/amplify-go-function-runtime-provider/package.json
index 6ef5112757b..2af5e688a09 100644
--- a/packages/amplify-go-function-runtime-provider/package.json
+++ b/packages/amplify-go-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-go-function-runtime-provider",
-  "version": "2.3.47",
+  "version": "2.3.48-gen2-migrations-test.0",
   "description": "Provides functionality related to functions in Go 1.x on AWS",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "archiver": "^5.3.0",
     "execa": "^5.1.1",
diff --git a/packages/amplify-java-function-runtime-provider/CHANGELOG.md b/packages/amplify-java-function-runtime-provider/CHANGELOG.md
index 0b8e29c6af1..1288de6b343 100644
--- a/packages/amplify-java-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-java-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.48-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-java-function-runtime-provider@2.3.47...amplify-java-function-runtime-provider@2.3.48-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package amplify-java-function-runtime-provider
+
+
+
+
+
 ## [2.3.47](https://github.com/aws-amplify/amplify-cli/compare/amplify-java-function-runtime-provider@2.3.46...amplify-java-function-runtime-provider@2.3.47) (2024-08-02)
 
 **Note:** Version bump only for package amplify-java-function-runtime-provider
diff --git a/packages/amplify-java-function-runtime-provider/package.json b/packages/amplify-java-function-runtime-provider/package.json
index cf5fa34baf8..b9ac17de51d 100644
--- a/packages/amplify-java-function-runtime-provider/package.json
+++ b/packages/amplify-java-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-java-function-runtime-provider",
-  "version": "2.3.47",
+  "version": "2.3.48-gen2-migrations-test.0",
   "description": "Provides functionality related to functions in JAVA on AWS",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-migration-codegen-e2e/CHANGELOG.md b/packages/amplify-migration-codegen-e2e/CHANGELOG.md
new file mode 100644
index 00000000000..852f0f4d11c
--- /dev/null
+++ b/packages/amplify-migration-codegen-e2e/CHANGELOG.md
@@ -0,0 +1,16 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0-gen2-migrations-test.0 (2024-09-23)
+
+
+### Bug Fixes
+
+* make gen2 migration packages public ([a7832cb](https://github.com/aws-amplify/amplify-cli/commit/a7832cb622cabf3eec3f770393477256117ea47d))
+
+
+### Features
+
+* **cli:** initial migration merge ([#13856](https://github.com/aws-amplify/amplify-cli/issues/13856)) ([ebe5cd0](https://github.com/aws-amplify/amplify-cli/commit/ebe5cd046cfb18c38ffdce17610ed3a133cc9d44))
diff --git a/packages/amplify-migration-codegen-e2e/package.json b/packages/amplify-migration-codegen-e2e/package.json
index 6d72b20d77d..17cb0eb195a 100644
--- a/packages/amplify-migration-codegen-e2e/package.json
+++ b/packages/amplify-migration-codegen-e2e/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@aws-amplify/amplify-migration-e2e",
   "private": true,
-  "version": "0.0.1",
+  "version": "0.1.0-gen2-migrations-test.0",
   "main": "index.js",
   "dependencies": {
-    "@aws-amplify/amplify-gen2-codegen": "^0.0.1"
+    "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0"
   },
   "devDependencies": {
     "jest": "^29.5.0",
@@ -33,6 +33,9 @@
     ],
     "collectCoverage": true
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "exit 0",
     "pretest": "mkdir -p coverage",
diff --git a/packages/amplify-migration-tests/CHANGELOG.md b/packages/amplify-migration-tests/CHANGELOG.md
index 7609e8aad97..fb41e9a8ce5 100644
--- a/packages/amplify-migration-tests/CHANGELOG.md
+++ b/packages/amplify-migration-tests/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.4.0-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-migration-tests@6.3.10...@aws-amplify/amplify-migration-tests@6.4.0-gen2-migrations-test.0) (2024-09-23)
+
+
+### Features
+
+* fixed lint ([0ed8fbe](https://github.com/aws-amplify/amplify-cli/commit/0ed8fbe2347c2f67cc022f06b671bea8ceb82538))
+
+
+
+
+
 ## [6.3.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-migration-tests@6.3.9...@aws-amplify/amplify-migration-tests@6.3.10) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-migration-tests
diff --git a/packages/amplify-migration-tests/package.json b/packages/amplify-migration-tests/package.json
index 80ad7c8329d..8d9806bec53 100644
--- a/packages/amplify-migration-tests/package.json
+++ b/packages/amplify-migration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-migration-tests",
-  "version": "6.3.10",
+  "version": "6.4.0-gen2-migrations-test.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "setup-profile": "ts-node ./src/configure_tests.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-e2e-core": "5.5.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-e2e-core": "5.5.11-gen2-migrations-test.0",
     "@aws-cdk/cloudformation-diff": "~2.68.0",
     "@aws-sdk/client-s3": "^3.303.0",
     "amplify-headless-interface": "1.17.7",
diff --git a/packages/amplify-migration/CHANGELOG.md b/packages/amplify-migration/CHANGELOG.md
new file mode 100644
index 00000000000..68630670259
--- /dev/null
+++ b/packages/amplify-migration/CHANGELOG.md
@@ -0,0 +1,72 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [0.1.0-gen2-migration-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/migrate@0.1.0-gen2-migrations-test.0...@aws-amplify/migrate@0.1.0-gen2-migration-test.0) (2024-09-23)
+
+
+### Bug Fixes
+
+* **migrate:** add README ([51b0d66](https://github.com/aws-amplify/amplify-cli/commit/51b0d666292ae766b7b36ec3f171cb0f281674fc))
+
+
+
+
+
+# 0.1.0-gen2-migrations-test.0 (2024-09-23)
+
+
+### Bug Fixes
+
+* add attribute mapping for external providers ([4f4d9fd](https://github.com/aws-amplify/amplify-cli/commit/4f4d9fd261eefbaca6bd3a563b03e59573869e91))
+* add relevant removed code due to incorrect merge ([fe1ab64](https://github.com/aws-amplify/amplify-cli/commit/fe1ab6430a668fb55e280552cb358ae97503d002))
+* bugfixes for data codegen ([#13880](https://github.com/aws-amplify/amplify-cli/issues/13880)) ([263cd85](https://github.com/aws-amplify/amplify-cli/commit/263cd85da1acb689e647db42fe0bf176da036cb5))
+* correct package versions; remove unused import ([32b3382](https://github.com/aws-amplify/amplify-cli/commit/32b338286bef118f139ba0d0d98a9d45f23920fb))
+* correct package versions; remove unused import ([2855e28](https://github.com/aws-amplify/amplify-cli/commit/2855e28744bc0d319ff85d7a7a1a36d5fbdad253))
+* data definition fetcher handle undefined data stack ([#13886](https://github.com/aws-amplify/amplify-cli/issues/13886)) ([3a2549c](https://github.com/aws-amplify/amplify-cli/commit/3a2549cae564fa1291f44d64145c46d9df733fc3))
+* extract api ([6f4c58b](https://github.com/aws-amplify/amplify-cli/commit/6f4c58b947fa3be4c2c7c200484fa46b6823bb30))
+* linting error fix ([4244c77](https://github.com/aws-amplify/amplify-cli/commit/4244c77eb2141a9837de26287a6739d53701b79d))
+* make gen2 migration packages public ([a7832cb](https://github.com/aws-amplify/amplify-cli/commit/a7832cb622cabf3eec3f770393477256117ea47d))
+* **migrate:** add test-ci cmd ([c765b5e](https://github.com/aws-amplify/amplify-cli/commit/c765b5e0cfa8d0f8ac9bdd77c4eb3a261e0a933d))
+* **migrate:** convert to gen2 app ([abeb9c9](https://github.com/aws-amplify/amplify-cli/commit/abeb9c9863c6aa78dde0f5b10228537f1038c9b1))
+* **migrate:** prettier changes ([0fc0324](https://github.com/aws-amplify/amplify-cli/commit/0fc03241cc0095a45b1dc59f9102cdf3989daca7))
+* **migrate:** remove ci flag ([875f298](https://github.com/aws-amplify/amplify-cli/commit/875f298014e02d1d4feb544bb097a7ae2aa991d8))
+* **migrate:** remove commented code ([adfa586](https://github.com/aws-amplify/amplify-cli/commit/adfa586a431b14253b2515ce404bb388879a814b))
+* **migrate:** remove explicit js extension ([de079b9](https://github.com/aws-amplify/amplify-cli/commit/de079b9295484a9c944ade6ee9845b2c46fc1b5c))
+* **migrate:** remove unused code ([154dc60](https://github.com/aws-amplify/amplify-cli/commit/154dc6081b79109fccd9b365dbff7d563f3a427d))
+* **migrate:** update api doc ([9616366](https://github.com/aws-amplify/amplify-cli/commit/9616366930d2ffb9d7f8c08f491e9fdb5ec321fa))
+* **migrate:** update command names ([ef72979](https://github.com/aws-amplify/amplify-cli/commit/ef7297949d697c9c53f330745558246538f1343c))
+* **migrate:** use jest ([ee3063a](https://github.com/aws-amplify/amplify-cli/commit/ee3063ac3a9d4947851675e3c88bd7239031ed0e))
+* remove unused vars ([ca3de21](https://github.com/aws-amplify/amplify-cli/commit/ca3de21413a7860939c9c07b022d361bf0f99de7))
+* resolve failing test error ([c28e4f9](https://github.com/aws-amplify/amplify-cli/commit/c28e4f9418d6f6b9139b5c0907c2b76f723d7311))
+* resolve incorrect mfaconifg option ([5f1dd79](https://github.com/aws-amplify/amplify-cli/commit/5f1dd79bbebab1616a5752524d2ecb0ec255fd1a))
+* resolve test errors ([6e72ab4](https://github.com/aws-amplify/amplify-cli/commit/6e72ab4b3db6cfb52dc72fbea2651874402c81ba))
+* resolve workflow errors ([b2e96ea](https://github.com/aws-amplify/amplify-cli/commit/b2e96ea522810edcd4acc69a0b1fe2dc203edba7))
+* resolve workflow errors ([1d5be0a](https://github.com/aws-amplify/amplify-cli/commit/1d5be0a175f1053a6302dd2c1c7032fa75356f83))
+
+
+### Features
+
+* add comments to gen1 triggers ([#13866](https://github.com/aws-amplify/amplify-cli/issues/13866)) ([2ec9470](https://github.com/aws-amplify/amplify-cli/commit/2ec947084a89bb000f2b34cc2662121e8cf04fb6))
+* added an assert statement for meta file ([1945b71](https://github.com/aws-amplify/amplify-cli/commit/1945b71cb9c8ddf2cb652b2a87260ed1f643067d))
+* added functions auth ([acf5249](https://github.com/aws-amplify/amplify-cli/commit/acf52491cb3454d29b63d80e2038489ab2a82592))
+* added functions codegen ([8d6afa4](https://github.com/aws-amplify/amplify-cli/commit/8d6afa487e560db04692b8b815680d00e26924f9))
+* added functions codegen ([1bdabc7](https://github.com/aws-amplify/amplify-cli/commit/1bdabc76ad20206dd2711997c8059248c5877a9f))
+* bucket versioning override codegen ([c14156d](https://github.com/aws-amplify/amplify-cli/commit/c14156d4fed0514b0bf7ed6f885bac0419f3dcb2))
+* **cli:** initial migration merge ([f803827](https://github.com/aws-amplify/amplify-cli/commit/f8038278b95d321aef4ff75b1bd5a604815fc821))
+* **cli:** initial migration merge ([#13856](https://github.com/aws-amplify/amplify-cli/issues/13856)) ([ebe5cd0](https://github.com/aws-amplify/amplify-cli/commit/ebe5cd046cfb18c38ffdce17610ed3a133cc9d44))
+* functions codegeb ([ba3babf](https://github.com/aws-amplify/amplify-cli/commit/ba3babfb1403e8f740e1cfbf795707cdd085612f))
+* functions codegen ([50e91e2](https://github.com/aws-amplify/amplify-cli/commit/50e91e22fc97d4c8cee80dae17ab4b6976cccd40))
+* **migrate:** make as an independent executable ([0aeffb9](https://github.com/aws-amplify/amplify-cli/commit/0aeffb96b9fad75549d76d19778725eb522ad64e))
+* oidc/saml external providers codegen ([f248955](https://github.com/aws-amplify/amplify-cli/commit/f2489550925e2f90a53a7d0f833d53571a546ae1))
+* signup user attributes/groups auth codegen ([bacb17b](https://github.com/aws-amplify/amplify-cli/commit/bacb17b29f3bd55ac9d28b55903d4091a5786b15))
+* social auth codegen ([96cc8d5](https://github.com/aws-amplify/amplify-cli/commit/96cc8d580b39ba80745fd235bd00f2b724962adc))
+* storage codegen ([6ccb0ef](https://github.com/aws-amplify/amplify-cli/commit/6ccb0ef8db64b079f15ed7f943a8ac4b27a42211))
+* storage codegen ([9e45af9](https://github.com/aws-amplify/amplify-cli/commit/9e45af9c881572ce67d5bad7e05e057609c80b00))
+* storage triggers ([#13869](https://github.com/aws-amplify/amplify-cli/issues/13869)) ([3847399](https://github.com/aws-amplify/amplify-cli/commit/38473994e563cd90452ecc50639ea056bb8dd039))
+* unauthenticated logins codegen ([2d0b700](https://github.com/aws-amplify/amplify-cli/commit/2d0b700f099ceb36b70ab0745a562bcdd5f5ce4b))
+* update functions codegen ([411511d](https://github.com/aws-amplify/amplify-cli/commit/411511d463ba1cccabcf179319eddff06f535c51))
+* update functions codegen ([1ef8938](https://github.com/aws-amplify/amplify-cli/commit/1ef89380028856e39cfcb2b55e8fd1bd7f6e41ed))
+* updated functions codegen ([4ac9324](https://github.com/aws-amplify/amplify-cli/commit/4ac932478633274e87524aea9eb9f48d3640d36c))
+* updated secret code ([f54457b](https://github.com/aws-amplify/amplify-cli/commit/f54457b8280e4736ea84786f5879206d7eeed571))
diff --git a/packages/amplify-migration/README.md b/packages/amplify-migration/README.md
new file mode 100644
index 00000000000..75fd27107d3
--- /dev/null
+++ b/packages/amplify-migration/README.md
@@ -0,0 +1,9 @@
+## Usage
+
+### Gen2 Codegen
+
+In Gen1 root directory run the following to generate Gen2 code based on Gen1 configuration:
+
+`npx @aws-amplify/migrate to-gen-2 generate-code`
+
+Once this command runs successfully, the Gen1 project is converted to Gen2 with `amplify` directory containing Gen2 code and `.amplify/migration/amplify` containing Gen1 configuration as a backup.
diff --git a/packages/amplify-migration/package.json b/packages/amplify-migration/package.json
index 58e249ce0d4..a39f852123f 100644
--- a/packages/amplify-migration/package.json
+++ b/packages/amplify-migration/package.json
@@ -1,9 +1,12 @@
 {
   "name": "@aws-amplify/migrate",
-  "version": "0.0.1",
+  "version": "0.1.0-gen2-migration-test.0",
   "type": "commonjs",
   "main": "lib/index.js",
   "bin": "lib/migrate.js",
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "tsc",
     "test": "jest --logHeapUsage",
@@ -43,10 +46,10 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.3.9",
-    "@aws-amplify/amplify-gen1-codegen-auth-adapter": "^0.0.1",
-    "@aws-amplify/amplify-gen1-codegen-function-adapter": "^0.0.1",
-    "@aws-amplify/amplify-gen1-codegen-storage-adapter": "^0.0.1",
-    "@aws-amplify/amplify-gen2-codegen": "^0.0.1",
+    "@aws-amplify/amplify-gen1-codegen-auth-adapter": "0.1.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-gen1-codegen-function-adapter": "0.1.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-gen1-codegen-storage-adapter": "0.1.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0",
     "@aws-sdk/client-amplify": "^3.592.0",
     "@aws-sdk/client-amplifybackend": "^3.592.0",
     "@aws-sdk/client-cloudformation": "^3.592.0",
diff --git a/packages/amplify-migration/src/app_auth_definition_fetcher.ts b/packages/amplify-migration/src/app_auth_definition_fetcher.ts
index 6ee77c45b42..f9b7b2a0d80 100644
--- a/packages/amplify-migration/src/app_auth_definition_fetcher.ts
+++ b/packages/amplify-migration/src/app_auth_definition_fetcher.ts
@@ -11,8 +11,8 @@ import {
   LambdaConfigType,
   ListGroupsCommand,
   IdentityProviderType,
-  IdentityProviderTypeType,
   DescribeIdentityProviderCommand,
+  GetUserPoolMfaConfigCommand,
 } from '@aws-sdk/client-cognito-identity-provider';
 import { CognitoIdentityClient, DescribeIdentityPoolCommand } from '@aws-sdk/client-cognito-identity';
 import { getAuthDefinition } from '@aws-amplify/amplify-gen1-codegen-auth-adapter';
@@ -46,6 +46,12 @@ export class AppAuthDefinitionFetcher {
       }),
     );
 
+    const { MfaConfiguration: mfaConfig, SoftwareTokenMfaConfiguration: totpConfig } = await this.cognitoIdentityProviderClient.send(
+      new GetUserPoolMfaConfigCommand({
+        UserPoolId: resourcesByLogicalId['UserPool'].PhysicalResourceId,
+      }),
+    );
+
     const { UserPoolClient: webClient } = await this.cognitoIdentityProviderClient.send(
       new DescribeUserPoolClientCommand({
         UserPoolId: resourcesByLogicalId['UserPool'].PhysicalResourceId,
@@ -61,16 +67,14 @@ export class AppAuthDefinitionFetcher {
 
     const identityProvidersDetails: IdentityProviderType[] = [];
     for (const provider of identityProviders || []) {
-      if (provider.ProviderType === IdentityProviderTypeType.SAML || provider.ProviderType === IdentityProviderTypeType.OIDC) {
-        const { IdentityProvider: providerDetails } = await this.cognitoIdentityProviderClient.send(
-          new DescribeIdentityProviderCommand({
-            UserPoolId: resourcesByLogicalId['UserPool'].PhysicalResourceId,
-            ProviderName: provider.ProviderName,
-          }),
-        );
-        if (providerDetails) {
-          identityProvidersDetails.push(providerDetails);
-        }
+      const { IdentityProvider: providerDetails } = await this.cognitoIdentityProviderClient.send(
+        new DescribeIdentityProviderCommand({
+          UserPoolId: resourcesByLogicalId['UserPool'].PhysicalResourceId,
+          ProviderName: provider.ProviderName,
+        }),
+      );
+      if (providerDetails) {
+        identityProvidersDetails.push(providerDetails);
       }
     }
 
@@ -97,6 +101,8 @@ export class AppAuthDefinitionFetcher {
       webClient,
       authTriggerConnections,
       guestLogin,
+      mfaConfig,
+      totpConfig,
     });
   };
 }
diff --git a/packages/amplify-migration/src/app_functions_definition_fetcher.ts b/packages/amplify-migration/src/app_functions_definition_fetcher.ts
index 92ecd0628ff..2604b076f07 100644
--- a/packages/amplify-migration/src/app_functions_definition_fetcher.ts
+++ b/packages/amplify-migration/src/app_functions_definition_fetcher.ts
@@ -5,6 +5,14 @@ import { BackendEnvironmentResolver } from './backend_environment_selector';
 import { LambdaClient, GetFunctionCommand } from '@aws-sdk/client-lambda';
 import { StateManager } from '@aws-amplify/amplify-cli-core';
 
+interface AuthConfig {
+  dependsOn?: Array<{
+    category: string;
+    resourceName: string;
+  }>;
+  [key: string]: unknown;
+}
+
 export interface AppFunctionsDefinitionFetcher {
   getDefinition(): Promise<FunctionDefinition[] | undefined>;
 }
@@ -21,19 +29,17 @@ export class AppFunctionsDefinitionFetcher {
     assert(backendEnvironment?.stackName);
 
     const meta = this.stateManager.getMeta();
-    assert(meta);
-
-    const functions = meta.function;
+    const functions = meta?.function ?? {};
 
-    const auth = meta.auth;
-    const storageList = meta.storage;
+    const auth = meta?.auth;
+    const storageList = meta?.storage ?? {};
 
     const functionCategoryMap = new Map<string, string>();
 
-    const authValues: any = Object.values(auth)[0];
+    const authValues: AuthConfig | undefined = Object.values(auth)[0] as AuthConfig;
 
     // auth triggers
-    if (auth && authValues.dependsOn) {
+    if (auth && authValues && authValues.dependsOn) {
       for (const env of authValues.dependsOn) {
         if (env.category == 'function') {
           functionCategoryMap.set(env.resourceName, 'auth');
@@ -62,8 +68,6 @@ export class AppFunctionsDefinitionFetcher {
             functionCategoryMap.set(func, 'storage');
           }
         }
-      } else if (!functionCategoryMap.get(func)) {
-        functionCategoryMap.set(func, 'function');
       }
     });
 
@@ -76,7 +80,9 @@ export class AppFunctionsDefinitionFetcher {
       );
     });
 
-    const functionConfigurations = (await Promise.all(getFunctionPromises)).map((functionResponse) => functionResponse.Configuration!);
+    const functionConfigurations = (await Promise.all(getFunctionPromises))
+      .map((functionResponse) => functionResponse.Configuration ?? null)
+      .filter((config): config is NonNullable<typeof config> => config !== null);
 
     return getFunctionDefinition(functionConfigurations, functionCategoryMap);
   };
diff --git a/packages/amplify-migration/src/app_storage_definition_fetcher.ts b/packages/amplify-migration/src/app_storage_definition_fetcher.ts
index fd1b2dd5e63..97aef1c0ef5 100644
--- a/packages/amplify-migration/src/app_storage_definition_fetcher.ts
+++ b/packages/amplify-migration/src/app_storage_definition_fetcher.ts
@@ -1,16 +1,30 @@
 import fs from 'node:fs/promises';
-import assert from 'node:assert';
 import path from 'node:path';
 import { getStorageDefinition } from '@aws-amplify/amplify-gen1-codegen-storage-adapter';
 import { BackendDownloader } from './backend_downloader.js';
-import { StorageRenderParameters } from '@aws-amplify/amplify-gen2-codegen';
-import { GetBucketNotificationConfigurationCommand, S3Client } from '@aws-sdk/client-s3';
+import { StorageRenderParameters, StorageTriggerEvent, Lambda } from '@aws-amplify/amplify-gen2-codegen';
+import {
+  GetBucketNotificationConfigurationCommand,
+  S3Client,
+  GetBucketNotificationConfigurationCommandOutput,
+  GetBucketAccelerateConfigurationCommand,
+  GetBucketVersioningCommand,
+} from '@aws-sdk/client-s3';
 import { BackendEnvironmentResolver } from './backend_environment_selector';
 import { fileOrDirectoryExists } from './directory_exists';
 
 export interface AppStorageDefinitionFetcher {
   getDefinition(): Promise<ReturnType<typeof getStorageDefinition> | undefined>;
 }
+
+interface StorageOutput {
+  service: string;
+  output: {
+    Name?: string;
+    BucketName?: string;
+  };
+}
+
 export class AppStorageDefinitionFetcher {
   constructor(
     private backendEnvironmentResolver: BackendEnvironmentResolver,
@@ -21,32 +35,86 @@ export class AppStorageDefinitionFetcher {
     const contents = await fs.readFile(filePath, { encoding: 'utf8' });
     return JSON.parse(contents);
   };
+  private getFunctionPath = (functionName: string) => {
+    return path.join('amplify', 'backend', 'function', functionName, 'src');
+  };
+  private getStorageTriggers = (
+    connections: GetBucketNotificationConfigurationCommandOutput,
+  ): Partial<Record<StorageTriggerEvent, Lambda>> => {
+    const triggers: Partial<Record<StorageTriggerEvent, Lambda>> = {};
+    const lambdaFunctionConfigurations = connections.LambdaFunctionConfigurations || [];
+    for (const connection of lambdaFunctionConfigurations) {
+      const functionName = connection.LambdaFunctionArn ? connection.LambdaFunctionArn.split(':').pop()?.split('-')[0] : '';
+      const event = connection.Events ? connection.Events[0] : '';
+
+      if (event.includes('ObjectCreated') && functionName) {
+        triggers['onUpload' as StorageTriggerEvent] = { source: this.getFunctionPath(functionName) } as Lambda;
+      } else if (event.includes('ObjectRemoved') && functionName) {
+        triggers['onDelete' as StorageTriggerEvent] = { source: this.getFunctionPath(functionName) } as Lambda;
+      }
+    }
+
+    return triggers;
+  };
 
   getDefinition = async (): Promise<StorageRenderParameters | undefined> => {
     const backendEnvironment = await this.backendEnvironmentResolver.selectBackendEnvironment();
-    assert(backendEnvironment?.deploymentArtifacts);
+    if (!backendEnvironment?.deploymentArtifacts) return undefined;
+
     const currentCloudBackendDirectory = await this.ccbFetcher.getCurrentCloudBackend(backendEnvironment.deploymentArtifacts);
 
     const amplifyMetaPath = path.join(currentCloudBackendDirectory, 'amplify-meta.json');
 
-    assert(await fileOrDirectoryExists(amplifyMetaPath), 'Could not find amplify-meta.json');
+    if (!(await fileOrDirectoryExists(amplifyMetaPath))) {
+      throw new Error('Could not find amplify-meta.json');
+    }
 
     const amplifyMeta = (await this.readJsonFile(amplifyMetaPath)) ?? {};
+    let storageOptions: StorageRenderParameters | undefined = undefined;
+
     if ('storage' in amplifyMeta && Object.keys(amplifyMeta.storage).length) {
-      const storageName = Object.keys(amplifyMeta.storage)[0];
-      const cliInputsPath = path.join(currentCloudBackendDirectory, 'storage', storageName, 'cli-inputs.json');
-      assert(await fileOrDirectoryExists(cliInputsPath));
-      const cliInputs = await this.readJsonFile(cliInputsPath);
-      const bucketName = amplifyMeta.storage[storageName].output.BucketName;
-      assert(bucketName);
-      const triggers = await this.s3Client.send(new GetBucketNotificationConfigurationCommand({ Bucket: bucketName }));
-      console.log('triggers', triggers);
-      const storageOptions = getStorageDefinition({
-        cliInputs,
-        bucketName,
-      });
-      return storageOptions;
+      for (const [storageName, storage] of Object.entries(amplifyMeta.storage)) {
+        const cliInputsPath = path.join(currentCloudBackendDirectory, 'storage', storageName, 'cli-inputs.json');
+
+        if (!(await fileOrDirectoryExists(cliInputsPath))) {
+          throw new Error(`Could not find cli-inputs.json for ${storageName}`);
+        }
+
+        const cliInputs = await this.readJsonFile(cliInputsPath);
+        const storageOutput = storage as StorageOutput;
+        if (storageOutput.service === 'S3') {
+          const bucketName = storageOutput.output.BucketName;
+          if (!bucketName) throw new Error('Could not find bucket name');
+
+          const connections = await this.s3Client.send(new GetBucketNotificationConfigurationCommand({ Bucket: bucketName }));
+          const { Status: accelerateConfiguration } = await this.s3Client.send(
+            new GetBucketAccelerateConfigurationCommand({ Bucket: bucketName }),
+          );
+          const { Status: versioningConfiguration } = await this.s3Client.send(new GetBucketVersioningCommand({ Bucket: bucketName }));
+
+          const triggers = this.getStorageTriggers(connections);
+
+          const storageDefinition = getStorageDefinition({
+            cliInputs,
+            bucketName,
+            triggers,
+          });
+
+          if (!storageOptions) storageOptions = {};
+          storageOptions.accessPatterns = storageDefinition.accessPatterns;
+          storageOptions.storageIdentifier = storageDefinition.storageIdentifier;
+          storageOptions.triggers = storageDefinition.triggers;
+          storageOptions.accelerateConfiguration = accelerateConfiguration;
+          storageOptions.versioningConfiguration = versioningConfiguration;
+        } else if (storageOutput.service === 'DynamoDB') {
+          const tableName = storageOutput.output.Name?.split('-')[0];
+          if (!tableName) throw new Error('Could not find table name');
+
+          if (!storageOptions) storageOptions = {};
+          storageOptions.dynamoDB = tableName;
+        }
+      }
     }
-    return undefined;
+    return storageOptions;
   };
 }
diff --git a/packages/amplify-migration/src/index.ts b/packages/amplify-migration/src/index.ts
index 829c0f52e79..7538ece652c 100644
--- a/packages/amplify-migration/src/index.ts
+++ b/packages/amplify-migration/src/index.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import path from 'node:path';
+import fs from 'node:fs/promises';
 
 import { Gen2RenderingOptions, createGen2Renderer } from '@aws-amplify/amplify-gen2-codegen';
 
@@ -35,6 +36,10 @@ interface CodegenCommandParameters {
 
 export type AuthCliInputs = Record<string, unknown>;
 
+const TEMP_GEN_2_OUTPUT_DIR = 'amplify-gen2';
+const AMPLIFY_DIR = 'amplify';
+const MIGRATION_DIR = '.amplify/migration';
+
 const generateGen2Code = async ({
   logger,
   analytics,
@@ -167,7 +172,7 @@ export async function execute() {
   const backendEnvironment = await backendEnvironmentResolver.selectBackendEnvironment();
 
   await generateGen2Code({
-    outputDirectory: './output',
+    outputDirectory: TEMP_GEN_2_OUTPUT_DIR,
     storageDefinitionFetcher: new AppStorageDefinitionFetcher(backendEnvironmentResolver, new BackendDownloader(s3Client), s3Client),
     authDefinitionFetcher: new AppAuthDefinitionFetcher(
       cognitoIdentityPoolClient,
@@ -183,4 +188,12 @@ export async function execute() {
     backendEnvironmentName: backendEnvironment?.environmentName,
     appId: appId,
   });
+
+  // Move gen1 amplify to .amplify/migrations and move gen2 amplify from amplify-gen2 to amplify dir to convert current app to gen2.
+  const cwd = process.cwd();
+  await fs.mkdir(MIGRATION_DIR, { recursive: true });
+  await fs.rename(AMPLIFY_DIR, `${MIGRATION_DIR}/amplify`);
+  await fs.rename(`${TEMP_GEN_2_OUTPUT_DIR}/amplify`, `${cwd}/amplify`);
+  await fs.rename(`${TEMP_GEN_2_OUTPUT_DIR}/package.json`, `${cwd}/package.json`);
+  await fs.rm(TEMP_GEN_2_OUTPUT_DIR, { recursive: true });
 }
diff --git a/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md b/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md
index f44eb3e621c..541a9f884e9 100644
--- a/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.25-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-nodejs-function-runtime-provider@2.5.24...amplify-nodejs-function-runtime-provider@2.5.25-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package amplify-nodejs-function-runtime-provider
+
+
+
+
+
 ## [2.5.24](https://github.com/aws-amplify/amplify-cli/compare/amplify-nodejs-function-runtime-provider@2.5.23...amplify-nodejs-function-runtime-provider@2.5.24) (2024-08-02)
 
 **Note:** Version bump only for package amplify-nodejs-function-runtime-provider
diff --git a/packages/amplify-nodejs-function-runtime-provider/package.json b/packages/amplify-nodejs-function-runtime-provider/package.json
index 42e08ceb6bc..de93945d6a0 100644
--- a/packages/amplify-nodejs-function-runtime-provider/package.json
+++ b/packages/amplify-nodejs-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-nodejs-function-runtime-provider",
-  "version": "2.5.24",
+  "version": "2.5.25-gen2-migrations-test.0",
   "description": "Provides functionality related to functions in NodeJS on AWS",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "execa": "^5.1.1",
     "exit": "^0.1.2",
diff --git a/packages/amplify-nodejs-function-template-provider/CHANGELOG.md b/packages/amplify-nodejs-function-template-provider/CHANGELOG.md
index a4e8a8be3f4..f4eb16c4e9f 100644
--- a/packages/amplify-nodejs-function-template-provider/CHANGELOG.md
+++ b/packages/amplify-nodejs-function-template-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.10.11-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-nodejs-function-template-provider@2.10.10...@aws-amplify/amplify-nodejs-function-template-provider@2.10.11-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-nodejs-function-template-provider
+
+
+
+
+
 ## [2.10.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-nodejs-function-template-provider@2.10.9...@aws-amplify/amplify-nodejs-function-template-provider@2.10.10) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-nodejs-function-template-provider
diff --git a/packages/amplify-nodejs-function-template-provider/package.json b/packages/amplify-nodejs-function-template-provider/package.json
index 64f552365ea..ba1a3a553fd 100644
--- a/packages/amplify-nodejs-function-template-provider/package.json
+++ b/packages/amplify-nodejs-function-template-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-nodejs-function-template-provider",
-  "version": "2.10.10",
+  "version": "2.10.11-gen2-migrations-test.0",
   "description": "Node JS templates supplied by the Amplify Team",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "graphql-transformer-core": "^8.2.13",
diff --git a/packages/amplify-opensearch-simulator/CHANGELOG.md b/packages/amplify-opensearch-simulator/CHANGELOG.md
index 765cc8beca6..997466889e4 100644
--- a/packages/amplify-opensearch-simulator/CHANGELOG.md
+++ b/packages/amplify-opensearch-simulator/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.16-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-opensearch-simulator@1.7.15...@aws-amplify/amplify-opensearch-simulator@1.7.16-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-opensearch-simulator
+
+
+
+
+
 ## [1.7.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-opensearch-simulator@1.7.14...@aws-amplify/amplify-opensearch-simulator@1.7.15) (2024-08-02)
 
 **Note:** Version bump only for package @aws-amplify/amplify-opensearch-simulator
diff --git a/packages/amplify-opensearch-simulator/package.json b/packages/amplify-opensearch-simulator/package.json
index 1bafb0a0399..00d7fa33ce2 100644
--- a/packages/amplify-opensearch-simulator/package.json
+++ b/packages/amplify-opensearch-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-opensearch-simulator",
-  "version": "1.7.15",
+  "version": "1.7.16-gen2-migrations-test.0",
   "description": "Opensearch local simulator",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "aws-sdk": "^2.1464.0",
     "detect-port": "^1.3.0",
diff --git a/packages/amplify-provider-awscloudformation/CHANGELOG.md b/packages/amplify-provider-awscloudformation/CHANGELOG.md
index db83be1dde0..deb6723542e 100644
--- a/packages/amplify-provider-awscloudformation/CHANGELOG.md
+++ b/packages/amplify-provider-awscloudformation/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.10.14-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-provider-awscloudformation@8.10.13...@aws-amplify/amplify-provider-awscloudformation@8.10.14-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-provider-awscloudformation
+
+
+
+
+
 ## [8.10.13](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-provider-awscloudformation@8.10.12...@aws-amplify/amplify-provider-awscloudformation@8.10.13) (2024-08-06)
 
 
diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
index 40686303769..c761094c97a 100644
--- a/packages/amplify-provider-awscloudformation/package.json
+++ b/packages/amplify-provider-awscloudformation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-provider-awscloudformation",
-  "version": "8.10.13",
+  "version": "8.10.14-gen2-migrations-test.0",
   "description": "AWS CloudFormation Provider",
   "repository": {
     "type": "git",
@@ -28,13 +28,13 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-custom": "3.1.24",
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-category-custom": "3.1.25-gen2-migrations-test.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-cli-logger": "1.3.8",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@aws-amplify/amplify-util-import": "2.8.3",
-    "@aws-amplify/cli-extensibility-helper": "3.0.34",
+    "@aws-amplify/cli-extensibility-helper": "3.0.35-gen2-migrations-test.0",
     "@aws-amplify/graphql-transformer-core": "^2.9.3",
     "@aws-amplify/graphql-transformer-interfaces": "^3.10.1",
     "amplify-codegen": "^4.9.4",
diff --git a/packages/amplify-python-function-runtime-provider/CHANGELOG.md b/packages/amplify-python-function-runtime-provider/CHANGELOG.md
index ff5255b84f0..91043e28b8e 100644
--- a/packages/amplify-python-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-python-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.48-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-python-function-runtime-provider@2.4.47...amplify-python-function-runtime-provider@2.4.48-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package amplify-python-function-runtime-provider
+
+
+
+
+
 ## [2.4.47](https://github.com/aws-amplify/amplify-cli/compare/amplify-python-function-runtime-provider@2.4.46...amplify-python-function-runtime-provider@2.4.47) (2024-08-02)
 
 **Note:** Version bump only for package amplify-python-function-runtime-provider
diff --git a/packages/amplify-python-function-runtime-provider/package.json b/packages/amplify-python-function-runtime-provider/package.json
index 47da8511a65..6192527aa8c 100644
--- a/packages/amplify-python-function-runtime-provider/package.json
+++ b/packages/amplify-python-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-python-function-runtime-provider",
-  "version": "2.4.47",
+  "version": "2.4.48-gen2-migrations-test.0",
   "description": "Provides functionality related to functions in Python on AWS",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "execa": "^5.1.1",
     "glob": "^7.2.0",
diff --git a/packages/amplify-util-mock/CHANGELOG.md b/packages/amplify-util-mock/CHANGELOG.md
index 182f786b96e..189732cd203 100644
--- a/packages/amplify-util-mock/CHANGELOG.md
+++ b/packages/amplify-util-mock/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.10.7-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-mock@5.10.6...@aws-amplify/amplify-util-mock@5.10.7-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-util-mock
+
+
+
+
+
 ## [5.10.6](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-mock@5.10.5...@aws-amplify/amplify-util-mock@5.10.6) (2024-08-06)
 
 
diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
index 114b345e1c7..669262be826 100644
--- a/packages/amplify-util-mock/package.json
+++ b/packages/amplify-util-mock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-mock",
-  "version": "5.10.6",
+  "version": "5.10.7-gen2-migrations-test.0",
   "description": "amplify cli plugin providing local testing",
   "repository": {
     "type": "git",
@@ -31,16 +31,16 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-appsync-simulator": "2.16.5",
-    "@aws-amplify/amplify-category-function": "5.7.10",
-    "@aws-amplify/amplify-cli-core": "4.3.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.15",
-    "@aws-amplify/amplify-opensearch-simulator": "1.7.15",
+    "@aws-amplify/amplify-appsync-simulator": "2.16.6-gen2-migrations-test.0",
+    "@aws-amplify/amplify-category-function": "5.7.11-gen2-migrations-test.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.16-gen2-migrations-test.0",
+    "@aws-amplify/amplify-opensearch-simulator": "1.7.16-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "@aws-amplify/amplify-provider-awscloudformation": "8.10.13",
+    "@aws-amplify/amplify-provider-awscloudformation": "8.10.14-gen2-migrations-test.0",
     "@hapi/topo": "^5.0.0",
     "amplify-codegen": "^4.9.4",
-    "amplify-dynamodb-simulator": "2.9.19",
+    "amplify-dynamodb-simulator": "2.9.20-gen2-migrations-test.0",
     "amplify-storage-simulator": "1.11.3",
     "axios": "^1.6.7",
     "chokidar": "^3.5.3",
@@ -76,7 +76,7 @@
     "@types/node": "^12.12.6",
     "@types/semver": "^7.1.0",
     "@types/which": "^1.3.2",
-    "amplify-nodejs-function-runtime-provider": "2.5.24",
+    "amplify-nodejs-function-runtime-provider": "2.5.25-gen2-migrations-test.0",
     "aws-appsync": "^4.1.4",
     "aws-cdk-lib": "~2.129.0",
     "aws-sdk": "^2.1464.0",
diff --git a/packages/amplify-util-uibuilder/CHANGELOG.md b/packages/amplify-util-uibuilder/CHANGELOG.md
index 6b7f922759c..9be264fcd03 100644
--- a/packages/amplify-util-uibuilder/CHANGELOG.md
+++ b/packages/amplify-util-uibuilder/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.13-gen2-migrations-test.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.14.12...@aws-amplify/amplify-util-uibuilder@1.14.13-gen2-migrations-test.0) (2024-09-23)
+
+**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
+
+
+
+
+
 ## [1.14.12](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.14.11...@aws-amplify/amplify-util-uibuilder@1.14.12) (2024-08-06)
 
 
diff --git a/packages/amplify-util-uibuilder/package.json b/packages/amplify-util-uibuilder/package.json
index c5f05db867d..d7cc5bc6114 100644
--- a/packages/amplify-util-uibuilder/package.json
+++ b/packages/amplify-util-uibuilder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.14.12",
+  "version": "1.14.13-gen2-migrations-test.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-category-api": "^5.12.5",
-    "@aws-amplify/amplify-cli-core": "4.3.10",
+    "@aws-amplify/amplify-cli-core": "4.4.0-gen2-migrations-test.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@aws-amplify/codegen-ui": "2.14.2",
     "@aws-amplify/codegen-ui-react": "2.14.2",
diff --git a/yarn.lock b/yarn.lock
index 0bd614dc072..51f82ccfdfa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -75,14 +75,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-amplify/amplify-app@5.0.36, @aws-amplify/amplify-app@workspace:packages/amplify-app":
+"@aws-amplify/amplify-app@5.0.37-gen2-migrations-test.0, @aws-amplify/amplify-app@workspace:packages/amplify-app":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-app@workspace:packages/amplify-app"
   dependencies:
     "@aws-amplify/amplify-frontend-android": 3.5.8
     "@aws-amplify/amplify-frontend-flutter": 1.4.7
-    "@aws-amplify/amplify-frontend-ios": 3.7.7
-    "@aws-amplify/amplify-frontend-javascript": 3.10.18
+    "@aws-amplify/amplify-frontend-ios": 3.7.8-gen2-migrations-test.0
+    "@aws-amplify/amplify-frontend-javascript": 3.10.19-gen2-migrations-test.0
     "@types/glob": ^7.1.1
     chalk: ^4.1.1
     execa: ^5.1.1
@@ -100,11 +100,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-appsync-simulator@2.16.5, @aws-amplify/amplify-appsync-simulator@workspace:packages/amplify-appsync-simulator":
+"@aws-amplify/amplify-appsync-simulator@2.16.6-gen2-migrations-test.0, @aws-amplify/amplify-appsync-simulator@workspace:packages/amplify-appsync-simulator":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-appsync-simulator@workspace:packages/amplify-appsync-simulator"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-graphiql-explorer": 2.6.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@graphql-tools/schema": ^8.3.1
@@ -139,12 +139,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-analytics@5.0.36, @aws-amplify/amplify-category-analytics@workspace:packages/amplify-category-analytics":
+"@aws-amplify/amplify-category-analytics@5.0.37-gen2-migrations-test.0, @aws-amplify/amplify-category-analytics@workspace:packages/amplify-category-analytics":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-analytics@workspace:packages/amplify-category-analytics"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     fs-extra: ^8.1.0
     uuid: ^8.3.2
@@ -206,16 +206,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-amplify/amplify-category-auth@3.7.15, @aws-amplify/amplify-category-auth@workspace:packages/amplify-category-auth":
+"@aws-amplify/amplify-category-auth@3.7.16-gen2-migrations-test.0, @aws-amplify/amplify-category-auth@workspace:packages/amplify-category-auth":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-auth@workspace:packages/amplify-category-auth"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@aws-amplify/amplify-prompts": 2.8.6
     "@aws-amplify/amplify-util-import": 2.8.3
-    "@aws-amplify/cli-extensibility-helper": 3.0.34
+    "@aws-amplify/cli-extensibility-helper": 3.0.35-gen2-migrations-test.0
     "@aws-sdk/client-cognito-identity-provider": ^3.303.0
     "@aws-sdk/client-iam": ^3.303.0
     "@types/mime-types": ^2.1.1
@@ -241,11 +241,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-custom@3.1.24, @aws-amplify/amplify-category-custom@workspace:packages/amplify-category-custom":
+"@aws-amplify/amplify-category-custom@3.1.25-gen2-migrations-test.0, @aws-amplify/amplify-category-custom@workspace:packages/amplify-category-custom":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-custom@workspace:packages/amplify-category-custom"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@types/lodash": ^4.14.149
     aws-cdk-lib: ~2.129.0
@@ -259,12 +259,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-function@5.7.10, @aws-amplify/amplify-category-function@workspace:packages/amplify-category-function":
+"@aws-amplify/amplify-category-function@5.7.11-gen2-migrations-test.0, @aws-amplify/amplify-category-function@workspace:packages/amplify-category-function":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-function@workspace:packages/amplify-category-function"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@aws-amplify/amplify-prompts": 2.8.6
     "@types/folder-hash": ^4.0.1
@@ -287,11 +287,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-geo@3.5.15, @aws-amplify/amplify-category-geo@workspace:packages/amplify-category-geo":
+"@aws-amplify/amplify-category-geo@3.5.16-gen2-migrations-test.0, @aws-amplify/amplify-category-geo@workspace:packages/amplify-category-geo":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-geo@workspace:packages/amplify-category-geo"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@aws-sdk/client-location": ^3.303.0
     ajv: ^6.12.6
@@ -306,11 +306,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-hosting@3.5.37, @aws-amplify/amplify-category-hosting@workspace:packages/amplify-category-hosting":
+"@aws-amplify/amplify-category-hosting@3.5.38-gen2-migrations-test.0, @aws-amplify/amplify-category-hosting@workspace:packages/amplify-category-hosting":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-hosting@workspace:packages/amplify-category-hosting"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     chalk: ^4.1.1
     fs-extra: ^8.1.0
@@ -322,11 +322,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-interactions@5.1.29, @aws-amplify/amplify-category-interactions@workspace:packages/amplify-category-interactions":
+"@aws-amplify/amplify-category-interactions@5.1.30-gen2-migrations-test.0, @aws-amplify/amplify-category-interactions@workspace:packages/amplify-category-interactions":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-interactions@workspace:packages/amplify-category-interactions"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     fs-extra: ^8.1.0
     fuzzy: ^0.1.3
@@ -334,14 +334,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-notifications@2.26.23, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications":
+"@aws-amplify/amplify-category-notifications@2.26.24-gen2-migrations-test.0, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
-    "@aws-amplify/amplify-provider-awscloudformation": 8.10.13
+    "@aws-amplify/amplify-provider-awscloudformation": 8.10.14-gen2-migrations-test.0
     aws-sdk: ^2.1464.0
     chalk: ^4.1.1
     fs-extra: ^8.1.0
@@ -352,11 +352,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-predictions@5.5.15, @aws-amplify/amplify-category-predictions@workspace:packages/amplify-category-predictions":
+"@aws-amplify/amplify-category-predictions@5.5.16-gen2-migrations-test.0, @aws-amplify/amplify-category-predictions@workspace:packages/amplify-category-predictions":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-predictions@workspace:packages/amplify-category-predictions"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@aws-sdk/client-rekognition": ^3.303.0
     aws-sdk: ^2.1464.0
@@ -366,15 +366,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-category-storage@5.5.15, @aws-amplify/amplify-category-storage@workspace:packages/amplify-category-storage":
+"@aws-amplify/amplify-category-storage@5.5.16-gen2-migrations-test.0, @aws-amplify/amplify-category-storage@workspace:packages/amplify-category-storage":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-storage@workspace:packages/amplify-category-storage"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@aws-amplify/amplify-util-import": 2.8.3
-    "@aws-amplify/cli-extensibility-helper": 3.0.34
+    "@aws-amplify/cli-extensibility-helper": 3.0.35-gen2-migrations-test.0
     amplify-headless-interface: 1.17.7
     amplify-util-headless-input: 1.9.18
     aws-cdk-lib: ~2.129.0
@@ -391,7 +391,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-cli-core@4.3.10, @aws-amplify/amplify-cli-core@workspace:packages/amplify-cli-core":
+"@aws-amplify/amplify-cli-core@4.4.0-gen2-migrations-test.0, @aws-amplify/amplify-cli-core@workspace:packages/amplify-cli-core":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-cli-core@workspace:packages/amplify-cli-core"
   dependencies:
@@ -500,12 +500,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-console-hosting@2.5.34, @aws-amplify/amplify-console-hosting@workspace:packages/amplify-console-hosting":
+"@aws-amplify/amplify-console-hosting@2.5.35-gen2-migrations-test.0, @aws-amplify/amplify-console-hosting@workspace:packages/amplify-console-hosting":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-console-hosting@workspace:packages/amplify-console-hosting"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     archiver: ^5.3.0
     chalk: ^4.1.1
     cli-table3: ^0.6.0
@@ -523,8 +523,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-console-integration-tests@workspace:packages/amplify-console-integration-tests"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-e2e-core": 5.5.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-e2e-core": 5.5.11-gen2-migrations-test.0
     "@types/ini": ^1.3.30
     aws-sdk: ^2.1464.0
     dotenv: ^8.2.0
@@ -539,13 +539,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-container-hosting@2.8.12, @aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting":
+"@aws-amplify/amplify-container-hosting@2.8.13-gen2-migrations-test.0, @aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting"
   dependencies:
     "@aws-amplify/amplify-category-api": ^5.12.5
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     fs-extra: ^8.1.0
     inquirer: ^7.3.3
     mime-types: ^2.1.26
@@ -553,11 +553,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-dotnet-function-template-provider@2.6.10, @aws-amplify/amplify-dotnet-function-template-provider@workspace:packages/amplify-dotnet-function-template-provider":
+"@aws-amplify/amplify-dotnet-function-template-provider@2.6.11-gen2-migrations-test.0, @aws-amplify/amplify-dotnet-function-template-provider@workspace:packages/amplify-dotnet-function-template-provider":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-dotnet-function-template-provider@workspace:packages/amplify-dotnet-function-template-provider"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@types/inquirer": ^6.5.0
     "@types/lodash": ^4.14.149
@@ -566,11 +566,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-e2e-core@5.5.10, @aws-amplify/amplify-e2e-core@workspace:packages/amplify-e2e-core":
+"@aws-amplify/amplify-e2e-core@5.5.11-gen2-migrations-test.0, @aws-amplify/amplify-e2e-core@workspace:packages/amplify-e2e-core":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-e2e-core@workspace:packages/amplify-e2e-core"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-sdk/client-sts": ^3.303.0
     "@aws-sdk/credential-providers": ^3.303.0
     "@types/glob": ^7.1.1
@@ -598,11 +598,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-environment-parameters@1.9.15, @aws-amplify/amplify-environment-parameters@workspace:packages/amplify-environment-parameters":
+"@aws-amplify/amplify-environment-parameters@1.9.16-gen2-migrations-test.0, @aws-amplify/amplify-environment-parameters@workspace:packages/amplify-environment-parameters":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-environment-parameters@workspace:packages/amplify-environment-parameters"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     ajv: ^6.12.6
     aws-sdk: ^2.1464.0
     lodash: ^4.17.21
@@ -631,11 +631,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-frontend-ios@3.7.7, @aws-amplify/amplify-frontend-ios@workspace:packages/amplify-frontend-ios":
+"@aws-amplify/amplify-frontend-ios@3.7.8-gen2-migrations-test.0, @aws-amplify/amplify-frontend-ios@workspace:packages/amplify-frontend-ios":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-frontend-ios@workspace:packages/amplify-frontend-ios"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     execa: ^5.1.1
     fs-extra: ^8.1.0
     graphql-config: ^2.2.1
@@ -643,11 +643,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-frontend-javascript@3.10.18, @aws-amplify/amplify-frontend-javascript@workspace:packages/amplify-frontend-javascript":
+"@aws-amplify/amplify-frontend-javascript@3.10.19-gen2-migrations-test.0, @aws-amplify/amplify-frontend-javascript@workspace:packages/amplify-frontend-javascript":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-frontend-javascript@workspace:packages/amplify-frontend-javascript"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@babel/core": ^7.23.2
     "@babel/plugin-transform-modules-commonjs": 7.10.4
     chalk: ^4.1.1
@@ -672,11 +672,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-amplify/amplify-gen1-codegen-auth-adapter@^0.0.1, @aws-amplify/amplify-gen1-codegen-auth-adapter@workspace:packages/amplify-gen1-codegen-auth-adapter":
+"@aws-amplify/amplify-gen1-codegen-auth-adapter@0.1.0-gen2-migrations-test.0, @aws-amplify/amplify-gen1-codegen-auth-adapter@workspace:packages/amplify-gen1-codegen-auth-adapter":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-gen1-codegen-auth-adapter@workspace:packages/amplify-gen1-codegen-auth-adapter"
   dependencies:
-    "@aws-amplify/amplify-gen2-codegen": ^0.0.1
+    "@aws-amplify/amplify-gen2-codegen": 0.1.0-gen2-migrations-test.0
     "@aws-amplify/auth-construct": ^1.1.5
     "@aws-sdk/client-amplify": ^3.592.0
     "@aws-sdk/client-cognito-identity": ^3.592.0
@@ -690,7 +690,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-gen1-codegen-data-adapter@workspace:packages/amplify-gen1-codegen-data-adapter"
   dependencies:
-    "@aws-amplify/amplify-gen2-codegen": ^0.0.1
+    "@aws-amplify/amplify-gen2-codegen": 0.1.0-gen2-migrations-test.0
     "@aws-amplify/auth-construct": ^1.1.5
     "@aws-sdk/client-amplify": ^3.592.0
     "@aws-sdk/client-cloudformation": ^3.592.0
@@ -701,22 +701,22 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-gen1-codegen-function-adapter@^0.0.1, @aws-amplify/amplify-gen1-codegen-function-adapter@workspace:packages/amplify-gen1-codegen-function-adapter":
+"@aws-amplify/amplify-gen1-codegen-function-adapter@0.1.0-gen2-migrations-test.0, @aws-amplify/amplify-gen1-codegen-function-adapter@workspace:packages/amplify-gen1-codegen-function-adapter":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-gen1-codegen-function-adapter@workspace:packages/amplify-gen1-codegen-function-adapter"
   dependencies:
-    "@aws-amplify/amplify-gen2-codegen": ^0.0.1
+    "@aws-amplify/amplify-gen2-codegen": 0.1.0-gen2-migrations-test.0
     "@aws-sdk/client-lambda": ^3.637.0
     jest: ^29.5.0
     typescript: ^5.4.5
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-gen1-codegen-storage-adapter@^0.0.1, @aws-amplify/amplify-gen1-codegen-storage-adapter@workspace:packages/amplify-gen1-codegen-storage-adapter":
+"@aws-amplify/amplify-gen1-codegen-storage-adapter@0.1.0-gen2-migrations-test.0, @aws-amplify/amplify-gen1-codegen-storage-adapter@workspace:packages/amplify-gen1-codegen-storage-adapter":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-gen1-codegen-storage-adapter@workspace:packages/amplify-gen1-codegen-storage-adapter"
   dependencies:
-    "@aws-amplify/amplify-gen2-codegen": ^0.0.1
+    "@aws-amplify/amplify-gen2-codegen": 0.1.0-gen2-migrations-test.0
     "@aws-sdk/client-amplify": ^3.592.0
     "@aws-sdk/client-cognito-identity": ^3.592.0
     "@aws-sdk/client-cognito-identity-provider": ^3.592.0
@@ -726,13 +726,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-gen2-codegen@^0.0.1, @aws-amplify/amplify-gen2-codegen@workspace:packages/amplify-gen2-codegen":
+"@aws-amplify/amplify-gen2-codegen@0.1.0-gen2-migrations-test.0, @aws-amplify/amplify-gen2-codegen@workspace:packages/amplify-gen2-codegen":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-gen2-codegen@workspace:packages/amplify-gen2-codegen"
   dependencies:
     "@aws-amplify/auth-construct": ^1.1.5
     "@aws-sdk/client-cognito-identity-provider": ^3.592.0
-    "@aws-sdk/client-lambda": ^3.637.0
+    "@aws-sdk/client-lambda": ^3.651.1
+    "@aws-sdk/client-s3": ^3.651.1
     "@types/node": ^20.14.2
     aws-cdk-lib: ^2.127.0
     jest: ^29.5.0
@@ -834,7 +835,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-migration-e2e@workspace:packages/amplify-migration-codegen-e2e"
   dependencies:
-    "@aws-amplify/amplify-gen2-codegen": ^0.0.1
+    "@aws-amplify/amplify-gen2-codegen": 0.1.0-gen2-migrations-test.0
     jest: ^29.5.0
     typescript: ^5.4.5
   languageName: unknown
@@ -844,8 +845,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-migration-tests@workspace:packages/amplify-migration-tests"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-e2e-core": 5.5.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-e2e-core": 5.5.11-gen2-migrations-test.0
     "@aws-cdk/cloudformation-diff": ~2.68.0
     "@aws-sdk/client-s3": ^3.303.0
     amplify-headless-interface: 1.17.7
@@ -863,11 +864,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-nodejs-function-template-provider@2.10.10, @aws-amplify/amplify-nodejs-function-template-provider@workspace:packages/amplify-nodejs-function-template-provider":
+"@aws-amplify/amplify-nodejs-function-template-provider@2.10.11-gen2-migrations-test.0, @aws-amplify/amplify-nodejs-function-template-provider@workspace:packages/amplify-nodejs-function-template-provider":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-nodejs-function-template-provider@workspace:packages/amplify-nodejs-function-template-provider"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@aws-amplify/amplify-prompts": 2.8.6
     "@types/fs-extra": ^8.0.1
@@ -878,11 +879,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-opensearch-simulator@1.7.15, @aws-amplify/amplify-opensearch-simulator@workspace:packages/amplify-opensearch-simulator":
+"@aws-amplify/amplify-opensearch-simulator@1.7.16-gen2-migrations-test.0, @aws-amplify/amplify-opensearch-simulator@workspace:packages/amplify-opensearch-simulator":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-opensearch-simulator@workspace:packages/amplify-opensearch-simulator"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@types/node": ^12.12.6
     "@types/openpgp": ^4.4.19
@@ -912,17 +913,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-provider-awscloudformation@8.10.13, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation":
+"@aws-amplify/amplify-provider-awscloudformation@8.10.14-gen2-migrations-test.0, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation"
   dependencies:
-    "@aws-amplify/amplify-category-custom": 3.1.24
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-category-custom": 3.1.25-gen2-migrations-test.0
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-cli-logger": 1.3.8
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@aws-amplify/amplify-util-import": 2.8.3
-    "@aws-amplify/cli-extensibility-helper": 3.0.34
+    "@aws-amplify/cli-extensibility-helper": 3.0.35-gen2-migrations-test.0
     "@aws-amplify/graphql-transformer-core": ^2.9.3
     "@aws-amplify/graphql-transformer-interfaces": ^3.10.1
     "@types/columnify": ^1.5.0
@@ -985,18 +986,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-util-mock@5.10.6, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock":
+"@aws-amplify/amplify-util-mock@5.10.7-gen2-migrations-test.0, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock"
   dependencies:
-    "@aws-amplify/amplify-appsync-simulator": 2.16.5
-    "@aws-amplify/amplify-category-function": 5.7.10
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-appsync-simulator": 2.16.6-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-function": 5.7.11-gen2-migrations-test.0
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
-    "@aws-amplify/amplify-opensearch-simulator": 1.7.15
+    "@aws-amplify/amplify-opensearch-simulator": 1.7.16-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
-    "@aws-amplify/amplify-provider-awscloudformation": 8.10.13
+    "@aws-amplify/amplify-provider-awscloudformation": 8.10.14-gen2-migrations-test.0
     "@aws-amplify/graphql-auth-transformer": ^3.6.4
     "@aws-amplify/graphql-default-value-transformer": ^2.3.12
     "@aws-amplify/graphql-function-transformer": ^2.1.26
@@ -1019,8 +1020,8 @@ __metadata:
     "@types/semver": ^7.1.0
     "@types/which": ^1.3.2
     amplify-codegen: ^4.9.4
-    amplify-dynamodb-simulator: 2.9.19
-    amplify-nodejs-function-runtime-provider: 2.5.24
+    amplify-dynamodb-simulator: 2.9.20-gen2-migrations-test.0
+    amplify-nodejs-function-runtime-provider: 2.5.25-gen2-migrations-test.0
     amplify-storage-simulator: 1.11.3
     aws-appsync: ^4.1.4
     aws-cdk-lib: ~2.129.0
@@ -1055,12 +1056,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/amplify-util-uibuilder@1.14.12, @aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder":
+"@aws-amplify/amplify-util-uibuilder@1.14.13-gen2-migrations-test.0, @aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder"
   dependencies:
     "@aws-amplify/amplify-category-api": ^5.12.5
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
     "@aws-amplify/appsync-modelgen-plugin": ^2.6.0
     "@aws-amplify/codegen-ui": 2.14.2
@@ -1215,52 +1216,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-amplify/cli-extensibility-helper@3.0.34, @aws-amplify/cli-extensibility-helper@workspace:packages/amplify-cli-extensibility-helper":
+"@aws-amplify/cli-extensibility-helper@3.0.35-gen2-migrations-test.0, @aws-amplify/cli-extensibility-helper@workspace:packages/amplify-cli-extensibility-helper":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/cli-extensibility-helper@workspace:packages/amplify-cli-extensibility-helper"
   dependencies:
-    "@aws-amplify/amplify-category-custom": 3.1.24
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-category-custom": 3.1.25-gen2-migrations-test.0
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     aws-cdk-lib: ~2.129.0
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/cli-internal@12.12.6, @aws-amplify/cli-internal@workspace:packages/amplify-cli":
+"@aws-amplify/cli-internal@12.13.0-gen2-migration-test.0, @aws-amplify/cli-internal@workspace:packages/amplify-cli":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/cli-internal@workspace:packages/amplify-cli"
   dependencies:
-    "@aws-amplify/amplify-app": 5.0.36
-    "@aws-amplify/amplify-category-analytics": 5.0.36
+    "@aws-amplify/amplify-app": 5.0.37-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-analytics": 5.0.37-gen2-migrations-test.0
     "@aws-amplify/amplify-category-api": ^5.12.5
-    "@aws-amplify/amplify-category-auth": 3.7.15
-    "@aws-amplify/amplify-category-custom": 3.1.24
-    "@aws-amplify/amplify-category-function": 5.7.10
-    "@aws-amplify/amplify-category-geo": 3.5.15
-    "@aws-amplify/amplify-category-hosting": 3.5.37
-    "@aws-amplify/amplify-category-interactions": 5.1.29
-    "@aws-amplify/amplify-category-notifications": 2.26.23
-    "@aws-amplify/amplify-category-predictions": 5.5.15
-    "@aws-amplify/amplify-category-storage": 5.5.15
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-category-auth": 3.7.16-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-custom": 3.1.25-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-function": 5.7.11-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-geo": 3.5.16-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-hosting": 3.5.38-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-interactions": 5.1.30-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-notifications": 2.26.24-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-predictions": 5.5.16-gen2-migrations-test.0
+    "@aws-amplify/amplify-category-storage": 5.5.16-gen2-migrations-test.0
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-cli-logger": 1.3.8
     "@aws-amplify/amplify-cli-shared-interfaces": 1.2.5
-    "@aws-amplify/amplify-console-hosting": 2.5.34
-    "@aws-amplify/amplify-container-hosting": 2.8.12
-    "@aws-amplify/amplify-dotnet-function-template-provider": 2.6.10
-    "@aws-amplify/amplify-environment-parameters": 1.9.15
+    "@aws-amplify/amplify-console-hosting": 2.5.35-gen2-migrations-test.0
+    "@aws-amplify/amplify-container-hosting": 2.8.13-gen2-migrations-test.0
+    "@aws-amplify/amplify-dotnet-function-template-provider": 2.6.11-gen2-migrations-test.0
+    "@aws-amplify/amplify-environment-parameters": 1.9.16-gen2-migrations-test.0
     "@aws-amplify/amplify-frontend-android": 3.5.8
     "@aws-amplify/amplify-frontend-flutter": 1.4.7
-    "@aws-amplify/amplify-frontend-ios": 3.7.7
-    "@aws-amplify/amplify-frontend-javascript": 3.10.18
+    "@aws-amplify/amplify-frontend-ios": 3.7.8-gen2-migrations-test.0
+    "@aws-amplify/amplify-frontend-javascript": 3.10.19-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@aws-amplify/amplify-go-function-template-provider": 1.4.8
-    "@aws-amplify/amplify-nodejs-function-template-provider": 2.10.10
+    "@aws-amplify/amplify-nodejs-function-template-provider": 2.10.11-gen2-migrations-test.0
     "@aws-amplify/amplify-prompts": 2.8.6
-    "@aws-amplify/amplify-provider-awscloudformation": 8.10.13
+    "@aws-amplify/amplify-provider-awscloudformation": 8.10.14-gen2-migrations-test.0
     "@aws-amplify/amplify-python-function-template-provider": 1.4.7
     "@aws-amplify/amplify-util-import": 2.8.3
-    "@aws-amplify/amplify-util-mock": 5.10.6
-    "@aws-amplify/amplify-util-uibuilder": 1.14.12
+    "@aws-amplify/amplify-util-mock": 5.10.7-gen2-migrations-test.0
+    "@aws-amplify/amplify-util-uibuilder": 1.14.13-gen2-migrations-test.0
     "@aws-cdk/cloudformation-diff": ~2.68.0
     "@types/archiver": ^5.3.1
     "@types/columnify": ^1.5.1
@@ -1276,13 +1277,13 @@ __metadata:
     "@types/treeify": ^1.0.0
     "@types/update-notifier": ^5.1.0
     amplify-codegen: ^4.9.4
-    amplify-dotnet-function-runtime-provider: 2.0.29
-    amplify-go-function-runtime-provider: 2.3.47
+    amplify-dotnet-function-runtime-provider: 2.0.30-gen2-migrations-test.0
+    amplify-go-function-runtime-provider: 2.3.48-gen2-migrations-test.0
     amplify-headless-interface: 1.17.7
-    amplify-java-function-runtime-provider: 2.3.47
+    amplify-java-function-runtime-provider: 2.3.48-gen2-migrations-test.0
     amplify-java-function-template-provider: 1.5.24
-    amplify-nodejs-function-runtime-provider: 2.5.24
-    amplify-python-function-runtime-provider: 2.4.47
+    amplify-nodejs-function-runtime-provider: 2.5.25-gen2-migrations-test.0
+    amplify-python-function-runtime-provider: 2.4.48-gen2-migrations-test.0
     aws-cdk-lib: ~2.129.0
     aws-sdk: ^2.1464.0
     chalk: ^4.1.1
@@ -1325,7 +1326,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aws-amplify/cli@workspace:packages/amplify-cli-npm"
   dependencies:
-    "@aws-amplify/cli-internal": 12.12.6
+    "@aws-amplify/cli-internal": 12.13.0-gen2-migration-test.0
     "@types/tar": ^6.1.1
     axios: ^1.6.7
     rimraf: ^3.0.2
@@ -1789,10 +1790,10 @@ __metadata:
   resolution: "@aws-amplify/migrate@workspace:packages/amplify-migration"
   dependencies:
     "@aws-amplify/amplify-cli-core": 4.3.9
-    "@aws-amplify/amplify-gen1-codegen-auth-adapter": ^0.0.1
-    "@aws-amplify/amplify-gen1-codegen-function-adapter": ^0.0.1
-    "@aws-amplify/amplify-gen1-codegen-storage-adapter": ^0.0.1
-    "@aws-amplify/amplify-gen2-codegen": ^0.0.1
+    "@aws-amplify/amplify-gen1-codegen-auth-adapter": 0.1.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-gen1-codegen-function-adapter": 0.1.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-gen1-codegen-storage-adapter": 0.1.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-gen2-codegen": 0.1.0-gen2-migrations-test.0
     "@aws-sdk/client-amplify": ^3.592.0
     "@aws-sdk/client-amplifybackend": ^3.592.0
     "@aws-sdk/client-cloudformation": ^3.592.0
@@ -3038,7 +3039,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-lambda@npm:^3.637.0":
+"@aws-sdk/client-lambda@npm:^3.637.0, @aws-sdk/client-lambda@npm:^3.651.1":
   version: 3.653.0
   resolution: "@aws-sdk/client-lambda@npm:3.653.0"
   dependencies:
@@ -3475,69 +3476,69 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-s3@npm:^3.25.0, @aws-sdk/client-s3@npm:^3.303.0, @aws-sdk/client-s3@npm:^3.592.0":
-  version: 3.624.0
-  resolution: "@aws-sdk/client-s3@npm:3.624.0"
+"@aws-sdk/client-s3@npm:^3.25.0, @aws-sdk/client-s3@npm:^3.303.0, @aws-sdk/client-s3@npm:^3.592.0, @aws-sdk/client-s3@npm:^3.651.1":
+  version: 3.651.1
+  resolution: "@aws-sdk/client-s3@npm:3.651.1"
   dependencies:
     "@aws-crypto/sha1-browser": 5.2.0
     "@aws-crypto/sha256-browser": 5.2.0
     "@aws-crypto/sha256-js": 5.2.0
-    "@aws-sdk/client-sso-oidc": 3.624.0
-    "@aws-sdk/client-sts": 3.624.0
-    "@aws-sdk/core": 3.624.0
-    "@aws-sdk/credential-provider-node": 3.624.0
-    "@aws-sdk/middleware-bucket-endpoint": 3.620.0
-    "@aws-sdk/middleware-expect-continue": 3.620.0
-    "@aws-sdk/middleware-flexible-checksums": 3.620.0
-    "@aws-sdk/middleware-host-header": 3.620.0
-    "@aws-sdk/middleware-location-constraint": 3.609.0
-    "@aws-sdk/middleware-logger": 3.609.0
-    "@aws-sdk/middleware-recursion-detection": 3.620.0
-    "@aws-sdk/middleware-sdk-s3": 3.624.0
-    "@aws-sdk/middleware-ssec": 3.609.0
-    "@aws-sdk/middleware-user-agent": 3.620.0
-    "@aws-sdk/region-config-resolver": 3.614.0
-    "@aws-sdk/signature-v4-multi-region": 3.624.0
-    "@aws-sdk/types": 3.609.0
-    "@aws-sdk/util-endpoints": 3.614.0
-    "@aws-sdk/util-user-agent-browser": 3.609.0
-    "@aws-sdk/util-user-agent-node": 3.614.0
-    "@aws-sdk/xml-builder": 3.609.0
-    "@smithy/config-resolver": ^3.0.5
-    "@smithy/core": ^2.3.2
-    "@smithy/eventstream-serde-browser": ^3.0.5
-    "@smithy/eventstream-serde-config-resolver": ^3.0.3
-    "@smithy/eventstream-serde-node": ^3.0.4
-    "@smithy/fetch-http-handler": ^3.2.4
-    "@smithy/hash-blob-browser": ^3.1.2
-    "@smithy/hash-node": ^3.0.3
-    "@smithy/hash-stream-node": ^3.1.2
-    "@smithy/invalid-dependency": ^3.0.3
-    "@smithy/md5-js": ^3.0.3
-    "@smithy/middleware-content-length": ^3.0.5
-    "@smithy/middleware-endpoint": ^3.1.0
-    "@smithy/middleware-retry": ^3.0.14
-    "@smithy/middleware-serde": ^3.0.3
-    "@smithy/middleware-stack": ^3.0.3
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/node-http-handler": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
-    "@smithy/url-parser": ^3.0.3
+    "@aws-sdk/client-sso-oidc": 3.651.1
+    "@aws-sdk/client-sts": 3.651.1
+    "@aws-sdk/core": 3.651.1
+    "@aws-sdk/credential-provider-node": 3.651.1
+    "@aws-sdk/middleware-bucket-endpoint": 3.649.0
+    "@aws-sdk/middleware-expect-continue": 3.649.0
+    "@aws-sdk/middleware-flexible-checksums": 3.651.1
+    "@aws-sdk/middleware-host-header": 3.649.0
+    "@aws-sdk/middleware-location-constraint": 3.649.0
+    "@aws-sdk/middleware-logger": 3.649.0
+    "@aws-sdk/middleware-recursion-detection": 3.649.0
+    "@aws-sdk/middleware-sdk-s3": 3.651.1
+    "@aws-sdk/middleware-ssec": 3.649.0
+    "@aws-sdk/middleware-user-agent": 3.649.0
+    "@aws-sdk/region-config-resolver": 3.649.0
+    "@aws-sdk/signature-v4-multi-region": 3.651.1
+    "@aws-sdk/types": 3.649.0
+    "@aws-sdk/util-endpoints": 3.649.0
+    "@aws-sdk/util-user-agent-browser": 3.649.0
+    "@aws-sdk/util-user-agent-node": 3.649.0
+    "@aws-sdk/xml-builder": 3.649.0
+    "@smithy/config-resolver": ^3.0.6
+    "@smithy/core": ^2.4.1
+    "@smithy/eventstream-serde-browser": ^3.0.7
+    "@smithy/eventstream-serde-config-resolver": ^3.0.4
+    "@smithy/eventstream-serde-node": ^3.0.6
+    "@smithy/fetch-http-handler": ^3.2.5
+    "@smithy/hash-blob-browser": ^3.1.3
+    "@smithy/hash-node": ^3.0.4
+    "@smithy/hash-stream-node": ^3.1.3
+    "@smithy/invalid-dependency": ^3.0.4
+    "@smithy/md5-js": ^3.0.4
+    "@smithy/middleware-content-length": ^3.0.6
+    "@smithy/middleware-endpoint": ^3.1.1
+    "@smithy/middleware-retry": ^3.0.16
+    "@smithy/middleware-serde": ^3.0.4
+    "@smithy/middleware-stack": ^3.0.4
+    "@smithy/node-config-provider": ^3.1.5
+    "@smithy/node-http-handler": ^3.2.0
+    "@smithy/protocol-http": ^4.1.1
+    "@smithy/smithy-client": ^3.3.0
+    "@smithy/types": ^3.4.0
+    "@smithy/url-parser": ^3.0.4
     "@smithy/util-base64": ^3.0.0
     "@smithy/util-body-length-browser": ^3.0.0
     "@smithy/util-body-length-node": ^3.0.0
-    "@smithy/util-defaults-mode-browser": ^3.0.14
-    "@smithy/util-defaults-mode-node": ^3.0.14
-    "@smithy/util-endpoints": ^2.0.5
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-retry": ^3.0.3
-    "@smithy/util-stream": ^3.1.3
+    "@smithy/util-defaults-mode-browser": ^3.0.16
+    "@smithy/util-defaults-mode-node": ^3.0.16
+    "@smithy/util-endpoints": ^2.1.0
+    "@smithy/util-middleware": ^3.0.4
+    "@smithy/util-retry": ^3.0.4
+    "@smithy/util-stream": ^3.1.4
     "@smithy/util-utf8": ^3.0.0
-    "@smithy/util-waiter": ^3.1.2
+    "@smithy/util-waiter": ^3.1.3
     tslib: ^2.6.2
-  checksum: f40bd6c9fb0d87f8e154824089f97665110b4789bfee788d7a7faa93f122add57b48eb0d2f8616b11e4501825b8040fe9ecf04929e0c75234290fc77dfa0887e
+  checksum: 34d0058a5673896f349b63c484d4b3fccdc3e4171f89b672280630d65969c715aaefa69d9474c61d57e90af1bba68665e650b2711afaab54597864f6353e10fb
   languageName: node
   linkType: hard
 
@@ -5788,18 +5789,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-bucket-endpoint@npm:3.620.0":
-  version: 3.620.0
-  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.620.0"
+"@aws-sdk/middleware-bucket-endpoint@npm:3.649.0":
+  version: 3.649.0
+  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.649.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
+    "@aws-sdk/types": 3.649.0
     "@aws-sdk/util-arn-parser": 3.568.0
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
+    "@smithy/node-config-provider": ^3.1.5
+    "@smithy/protocol-http": ^4.1.1
+    "@smithy/types": ^3.4.0
     "@smithy/util-config-provider": ^3.0.0
     tslib: ^2.6.2
-  checksum: 5fec190026bac88554a2299d81565bb4f067600336045af5d4ec1e06a1a884386e324922f1de8d8d87954bd8dbdae279bf4e37401aaf8311db5fe70c1c44b483
+  checksum: fa8f1c3d3150c12e29256f0085c33f355e2b15f1db23b85120e7605b3ef06ec180592ebdb3c9a71ec9ef5277c74e1d3927888d642736e6825ffb7773c87f918e
   languageName: node
   linkType: hard
 
@@ -5896,31 +5897,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-expect-continue@npm:3.620.0":
-  version: 3.620.0
-  resolution: "@aws-sdk/middleware-expect-continue@npm:3.620.0"
+"@aws-sdk/middleware-expect-continue@npm:3.649.0":
+  version: 3.649.0
+  resolution: "@aws-sdk/middleware-expect-continue@npm:3.649.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
+    "@aws-sdk/types": 3.649.0
+    "@smithy/protocol-http": ^4.1.1
+    "@smithy/types": ^3.4.0
     tslib: ^2.6.2
-  checksum: 1204171772b3f141a19e68ede28b412c5bca68e4f5c493c38f41d278cbbaae0488d95e1161ed5b44aefcfbbb66f795f2aacfb24434d7fdd71695a1a3885c59bb
+  checksum: 57ca93a7abab8017fbfa38c3702841d8b803b764222a84d9f9091c760888dde235c3e9a928e4d76007b290b0b4274995099b84d1af9e5306ce0a067e0c3172e7
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-flexible-checksums@npm:3.620.0":
-  version: 3.620.0
-  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.620.0"
+"@aws-sdk/middleware-flexible-checksums@npm:3.651.1":
+  version: 3.651.1
+  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.651.1"
   dependencies:
     "@aws-crypto/crc32": 5.2.0
     "@aws-crypto/crc32c": 5.2.0
-    "@aws-sdk/types": 3.609.0
+    "@aws-sdk/types": 3.649.0
     "@smithy/is-array-buffer": ^3.0.0
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/types": ^3.3.0
+    "@smithy/node-config-provider": ^3.1.5
+    "@smithy/protocol-http": ^4.1.1
+    "@smithy/types": ^3.4.0
+    "@smithy/util-middleware": ^3.0.4
     "@smithy/util-utf8": ^3.0.0
     tslib: ^2.6.2
-  checksum: b6990776c98a19c57850ad623a61d45946741f75913cd71901d693ff71a840ea6fdbb7811d8849db6d149090bd2b61a6f3c706084a2d2b366c8e55c5f62e3186
+  checksum: 8108993555e6cfe126512d63d3b120424b3457f039e07a2d9720f4c810258a7d2fbcbc61c717e76450f71c9fbe34e8f3880190f27bef30143c5ab3710991ad19
   languageName: node
   linkType: hard
 
@@ -6016,14 +6019,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-location-constraint@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-location-constraint@npm:3.609.0"
+"@aws-sdk/middleware-location-constraint@npm:3.649.0":
+  version: 3.649.0
+  resolution: "@aws-sdk/middleware-location-constraint@npm:3.649.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
+    "@aws-sdk/types": 3.649.0
+    "@smithy/types": ^3.4.0
     tslib: ^2.6.2
-  checksum: 1eba2a3a1a003855a69e56f1c54fb2283b30db50bf14130cd042e25805497b7a19539144052c4fa710952d754d1a9e5d680fce09536509cf796a16816c8d506f
+  checksum: 6132d5d8b2eeda75d26123d364c2b217865a2c1472f80a1dc8856f152a08b912289048685ee67a53c7dd9c63f624e690f6008b7dd2780fb21706407abcb5ef6a
   languageName: node
   linkType: hard
 
@@ -6279,25 +6282,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-s3@npm:3.624.0":
-  version: 3.624.0
-  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.624.0"
+"@aws-sdk/middleware-sdk-s3@npm:3.651.1":
+  version: 3.651.1
+  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.651.1"
   dependencies:
-    "@aws-sdk/core": 3.624.0
-    "@aws-sdk/types": 3.609.0
+    "@aws-sdk/core": 3.651.1
+    "@aws-sdk/types": 3.649.0
     "@aws-sdk/util-arn-parser": 3.568.0
-    "@smithy/core": ^2.3.2
-    "@smithy/node-config-provider": ^3.1.4
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/signature-v4": ^4.1.0
-    "@smithy/smithy-client": ^3.1.12
-    "@smithy/types": ^3.3.0
+    "@smithy/core": ^2.4.1
+    "@smithy/node-config-provider": ^3.1.5
+    "@smithy/protocol-http": ^4.1.1
+    "@smithy/signature-v4": ^4.1.1
+    "@smithy/smithy-client": ^3.3.0
+    "@smithy/types": ^3.4.0
     "@smithy/util-config-provider": ^3.0.0
-    "@smithy/util-middleware": ^3.0.3
-    "@smithy/util-stream": ^3.1.3
+    "@smithy/util-middleware": ^3.0.4
+    "@smithy/util-stream": ^3.1.4
     "@smithy/util-utf8": ^3.0.0
     tslib: ^2.6.2
-  checksum: b1301a583759b41c4385a893d2776a8fb1115fa41d070fae1673e7732d3d6b3e96785023a2006e78f0bb2b214a54e2c0a0aeee3165531336682f7c00a8f42645
+  checksum: 0dc2d4d75e21fcd9b32afa59f6c1912380a5c807c8f6c983c57a80205db0f511856703058fcc7e939b9813bb91d669b576483dced037042a58579be3eb018860
   languageName: node
   linkType: hard
 
@@ -6485,14 +6488,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-ssec@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/middleware-ssec@npm:3.609.0"
+"@aws-sdk/middleware-ssec@npm:3.649.0":
+  version: 3.649.0
+  resolution: "@aws-sdk/middleware-ssec@npm:3.649.0"
   dependencies:
-    "@aws-sdk/types": 3.609.0
-    "@smithy/types": ^3.3.0
+    "@aws-sdk/types": 3.649.0
+    "@smithy/types": ^3.4.0
     tslib: ^2.6.2
-  checksum: 7688628299c3d3352182634836d8a5ad89d69dfedd91d7386ffeaa8288160329eef7d399321b7841bb4c84c9741d7245ef218657a8df71248b5ce5f7273e303d
+  checksum: a600f290f4ee703ace612edbda657da88f2402627bd2a80b77621fa70208fe205add95ecde075377f74df86b2946ff1c606436289f9c61a4d544d99864f8b9b7
   languageName: node
   linkType: hard
 
@@ -6989,17 +6992,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4-multi-region@npm:3.624.0":
-  version: 3.624.0
-  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.624.0"
+"@aws-sdk/signature-v4-multi-region@npm:3.651.1":
+  version: 3.651.1
+  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.651.1"
   dependencies:
-    "@aws-sdk/middleware-sdk-s3": 3.624.0
-    "@aws-sdk/types": 3.609.0
-    "@smithy/protocol-http": ^4.1.0
-    "@smithy/signature-v4": ^4.1.0
-    "@smithy/types": ^3.3.0
+    "@aws-sdk/middleware-sdk-s3": 3.651.1
+    "@aws-sdk/types": 3.649.0
+    "@smithy/protocol-http": ^4.1.1
+    "@smithy/signature-v4": ^4.1.1
+    "@smithy/types": ^3.4.0
     tslib: ^2.6.2
-  checksum: cd6ee325bd7cafeab7aeb2c7bd65666d5f3137eac9164c2082e6776af2ce706be959d08e1244596a388b6ab13c9ab3448aa1c9e7b486ad00f07078e971f90b26
+  checksum: 4bd6dff552c6aaf8688aa54771133ba4b50f6f28eee6ab37cba82202a15c1d704eb2a6592d6e56705be1b6e8daf8378012cde8b67339df42ff4ec318b60a5ad1
   languageName: node
   linkType: hard
 
@@ -8038,13 +8041,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/xml-builder@npm:3.609.0":
-  version: 3.609.0
-  resolution: "@aws-sdk/xml-builder@npm:3.609.0"
+"@aws-sdk/xml-builder@npm:3.649.0":
+  version: 3.649.0
+  resolution: "@aws-sdk/xml-builder@npm:3.649.0"
   dependencies:
-    "@smithy/types": ^3.3.0
+    "@smithy/types": ^3.4.0
     tslib: ^2.6.2
-  checksum: 1d75f2dc7ff35557a1c437f108656574c737f0a9f9d0c91773cbdadbf3c42892e9305e1e1fd5b0c8b73520a902b1513d1a7d07864b964d6a369540ee23ad0ddb
+  checksum: 4cdc8971a3472b8ec33efce82f83d754556043c750dc46c83612caaa368f3c8db287443b250ac91d8773961533fe3d2799773de7b5bf0aedeec2579973850ab7
   languageName: node
   linkType: hard
 
@@ -12254,7 +12257,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-browser@npm:^3.0.5, @smithy/eventstream-serde-browser@npm:^3.0.7":
+"@smithy/eventstream-serde-browser@npm:^3.0.7":
   version: 3.0.9
   resolution: "@smithy/eventstream-serde-browser@npm:3.0.9"
   dependencies:
@@ -12265,7 +12268,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-config-resolver@npm:^3.0.3, @smithy/eventstream-serde-config-resolver@npm:^3.0.4":
+"@smithy/eventstream-serde-config-resolver@npm:^3.0.4":
   version: 3.0.6
   resolution: "@smithy/eventstream-serde-config-resolver@npm:3.0.6"
   dependencies:
@@ -12275,7 +12278,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-node@npm:^3.0.4, @smithy/eventstream-serde-node@npm:^3.0.6":
+"@smithy/eventstream-serde-node@npm:^3.0.6":
   version: 3.0.8
   resolution: "@smithy/eventstream-serde-node@npm:3.0.8"
   dependencies:
@@ -12336,15 +12339,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/hash-blob-browser@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/hash-blob-browser@npm:3.1.2"
+"@smithy/hash-blob-browser@npm:^3.1.3":
+  version: 3.1.5
+  resolution: "@smithy/hash-blob-browser@npm:3.1.5"
   dependencies:
     "@smithy/chunked-blob-reader": ^3.0.0
     "@smithy/chunked-blob-reader-native": ^3.0.0
-    "@smithy/types": ^3.3.0
+    "@smithy/types": ^3.4.2
     tslib: ^2.6.2
-  checksum: 71b017ae71839e058661e22589bacbc204d4980df66d67725aaa415493107e2f0898e41d0c6a4cd2c96333648d472c66ed35ec3c264156e6021bda5d590eb5ab
+  checksum: 4633333ee44ff09a4df782444176e648b85f53e42767d3d3e66007019d5aa30718b70bbd49bced0bcdd33180cbe284b5366448f53bb3184498a84478794125a8
   languageName: node
   linkType: hard
 
@@ -12384,14 +12387,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/hash-stream-node@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/hash-stream-node@npm:3.1.2"
+"@smithy/hash-stream-node@npm:^3.1.3":
+  version: 3.1.5
+  resolution: "@smithy/hash-stream-node@npm:3.1.5"
   dependencies:
-    "@smithy/types": ^3.3.0
+    "@smithy/types": ^3.4.2
     "@smithy/util-utf8": ^3.0.0
     tslib: ^2.6.2
-  checksum: 2daadb5d6f08022ca1b1ecb4256d613613be86b7b768fb221ee3a2a7e584df0f4a546fba080e8366211c99f9ddb66d57e38525d10839405eab0b9d5be81d313b
+  checksum: 89a27d7f2d77ea6b3c98b02948922ed1cfa8fa6d26aaed04fb83468abf5e51d50f7f7bb3973dcdc478c57a7918f75fd359ac9b656e677e7d30f8ee01afd18464
   languageName: node
   linkType: hard
 
@@ -12452,14 +12455,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/md5-js@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@smithy/md5-js@npm:3.0.3"
+"@smithy/md5-js@npm:^3.0.4":
+  version: 3.0.6
+  resolution: "@smithy/md5-js@npm:3.0.6"
   dependencies:
-    "@smithy/types": ^3.3.0
+    "@smithy/types": ^3.4.2
     "@smithy/util-utf8": ^3.0.0
     tslib: ^2.6.2
-  checksum: 048b966676f5944da701120ca2e133de8a17fa403f2dc96dd88a82ea2248e2b439147b062ad8860486a9897899dd28de45cc0e2ae03c1221e2b987ad8e065464
+  checksum: d15cb0012df5d3f7ac762f432c66e54b4b36c580229c8d4f216bec8697b438b9842ff78a23619e7a10ec09a3d8589d2f0498336e3969090cc82bd2bf364f3635
   languageName: node
   linkType: hard
 
@@ -15494,11 +15497,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"amplify-dotnet-function-runtime-provider@2.0.29, amplify-dotnet-function-runtime-provider@workspace:packages/amplify-dotnet-function-runtime-provider":
+"amplify-dotnet-function-runtime-provider@2.0.30-gen2-migrations-test.0, amplify-dotnet-function-runtime-provider@workspace:packages/amplify-dotnet-function-runtime-provider":
   version: 0.0.0-use.local
   resolution: "amplify-dotnet-function-runtime-provider@workspace:packages/amplify-dotnet-function-runtime-provider"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@aws-amplify/amplify-prompts": 2.8.6
     "@types/node": ^12.12.6
@@ -15510,11 +15513,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"amplify-dynamodb-simulator@2.9.19, amplify-dynamodb-simulator@workspace:packages/amplify-dynamodb-simulator":
+"amplify-dynamodb-simulator@2.9.20-gen2-migrations-test.0, amplify-dynamodb-simulator@workspace:packages/amplify-dynamodb-simulator":
   version: 0.0.0-use.local
   resolution: "amplify-dynamodb-simulator@workspace:packages/amplify-dynamodb-simulator"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     aws-sdk: ^2.1464.0
     detect-port: ^1.3.0
     execa: ^5.1.1
@@ -15535,10 +15538,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "amplify-e2e-tests@workspace:packages/amplify-e2e-tests"
   dependencies:
-    "@aws-amplify/amplify-category-auth": 3.7.15
-    "@aws-amplify/amplify-cli-core": 4.3.10
-    "@aws-amplify/amplify-e2e-core": 5.5.10
-    "@aws-amplify/amplify-opensearch-simulator": 1.7.15
+    "@aws-amplify/amplify-category-auth": 3.7.16-gen2-migrations-test.0
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
+    "@aws-amplify/amplify-e2e-core": 5.5.11-gen2-migrations-test.0
+    "@aws-amplify/amplify-opensearch-simulator": 1.7.16-gen2-migrations-test.0
     "@aws-amplify/graphql-transformer-core": ^2.9.3
     "@aws-sdk/client-appsync": ^3.303.0
     "@aws-sdk/client-dynamodb": ^3.303.0
@@ -15552,7 +15555,7 @@ __metadata:
     "@types/node": ^18.16.1
     "@types/openpgp": ^4.4.18
     "@types/ws": ^7.4.4
-    amplify-dynamodb-simulator: 2.9.19
+    amplify-dynamodb-simulator: 2.9.20-gen2-migrations-test.0
     amplify-headless-interface: 1.17.7
     amplify-storage-simulator: 1.11.3
     aws-amplify: ^5.3.16
@@ -15587,11 +15590,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"amplify-go-function-runtime-provider@2.3.47, amplify-go-function-runtime-provider@workspace:packages/amplify-go-function-runtime-provider":
+"amplify-go-function-runtime-provider@2.3.48-gen2-migrations-test.0, amplify-go-function-runtime-provider@workspace:packages/amplify-go-function-runtime-provider":
   version: 0.0.0-use.local
   resolution: "amplify-go-function-runtime-provider@workspace:packages/amplify-go-function-runtime-provider"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@types/archiver": ^5.1.1
     "@types/node": ^12.12.6
@@ -15617,11 +15620,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"amplify-java-function-runtime-provider@2.3.47, amplify-java-function-runtime-provider@workspace:packages/amplify-java-function-runtime-provider":
+"amplify-java-function-runtime-provider@2.3.48-gen2-migrations-test.0, amplify-java-function-runtime-provider@workspace:packages/amplify-java-function-runtime-provider":
   version: 0.0.0-use.local
   resolution: "amplify-java-function-runtime-provider@workspace:packages/amplify-java-function-runtime-provider"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@types/node": ^12.12.6
     "@types/semver": ^7.1.0
@@ -15642,11 +15645,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"amplify-nodejs-function-runtime-provider@2.5.24, amplify-nodejs-function-runtime-provider@workspace:packages/amplify-nodejs-function-runtime-provider":
+"amplify-nodejs-function-runtime-provider@2.5.25-gen2-migrations-test.0, amplify-nodejs-function-runtime-provider@workspace:packages/amplify-nodejs-function-runtime-provider":
   version: 0.0.0-use.local
   resolution: "amplify-nodejs-function-runtime-provider@workspace:packages/amplify-nodejs-function-runtime-provider"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@types/exit": ^0.1.31
     "@types/node": ^12.12.6
@@ -15659,11 +15662,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"amplify-python-function-runtime-provider@2.4.47, amplify-python-function-runtime-provider@workspace:packages/amplify-python-function-runtime-provider":
+"amplify-python-function-runtime-provider@2.4.48-gen2-migrations-test.0, amplify-python-function-runtime-provider@workspace:packages/amplify-python-function-runtime-provider":
   version: 0.0.0-use.local
   resolution: "amplify-python-function-runtime-provider@workspace:packages/amplify-python-function-runtime-provider"
   dependencies:
-    "@aws-amplify/amplify-cli-core": 4.3.10
+    "@aws-amplify/amplify-cli-core": 4.4.0-gen2-migrations-test.0
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@types/fs-extra": ^8.0.1
     "@types/node": ^12.12.6