diff --git a/.github/ISSUE_TEMPLATE/2-enhancement.yml b/.github/ISSUE_TEMPLATE/2-enhancement.yml
index 3c7637cea8c..19383e15c27 100644
--- a/.github/ISSUE_TEMPLATE/2-enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/2-enhancement.yml
@@ -1,5 +1,5 @@
 name: ✨ Enhancement Request
-description: If you have an idea to improve an existing feature in core or need something for development (such as a new hook) please let us know or submit a Pull Request!
+description: If you have an idea to improve existing functionality in core or need something for development (such as a new hook) please let us know or submit a Pull Request!
 title: "[Enhancement]: "
 labels: ["type: enhancement", "status: awaiting triage"]
 body:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index dae2134fb39..f8f1bcc6e24 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: true
 contact_links:
+  - name: Feature Requests
+    url: https://woocommerce.com/feature-requests/woocommerce/
+    about: If you have an idea for a new feature that you wished existed in WooCommerce, take a look at our Feature Requests and vote, or open a new Feature Request yourself!
   - name: 🔒 Security issue
     url: https://hackerone.com/automattic/
     about: For security reasons, please report all security issues via HackerOne. If the issue is valid, a bug bounty will be paid out to you. Please disclose responsibly and not via GitHub (which allows for exploiting issues in the wild before the patch is released).
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0ff2173615b..eb4fdbc5e7f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,6 +9,8 @@
 
 ### Changes proposed in this Pull Request:
 
+<!-- If necessary, indicate if this PR is part of a bigger feature. Add a label with the format `focus: name of the feature [team:name of the team]`. -->
+
 <!-- Describe the changes made to this Pull Request and the reason for such changes. -->
 
 Closes # .
@@ -25,4 +27,4 @@ Using the [WooCommerce Testing Instructions Guide](https://github.com/woocommerc
 2.
 3.
 
-<!-- End testing instructions -->
\ No newline at end of file
+<!-- End testing instructions -->
diff --git a/.github/actions/tests/run-api-tests/action.yml b/.github/actions/tests/run-api-tests/action.yml
index 598a67a0d5f..f569e12afcc 100644
--- a/.github/actions/tests/run-api-tests/action.yml
+++ b/.github/actions/tests/run-api-tests/action.yml
@@ -9,6 +9,11 @@ inputs:
     tests:
         description: Specific tests to run, separated by single whitespace. See https://playwright.dev/docs/test-cli
 
+outputs:
+    result:
+        description: Whether the test passed or failed.
+        value: ${{ steps.run-api-tests.conclusion }}
+
 runs:
     using: composite
     steps:
diff --git a/.github/actions/tests/run-e2e-tests/action.yml b/.github/actions/tests/run-e2e-tests/action.yml
index ab04b6764c4..c2083543476 100644
--- a/.github/actions/tests/run-e2e-tests/action.yml
+++ b/.github/actions/tests/run-e2e-tests/action.yml
@@ -12,6 +12,11 @@ inputs:
         description: The Playwright configuration file to use.
         default: playwright.config.js
 
+outputs:
+    result:
+        description: Whether the test passed or failed.
+        value: ${{ steps.run-e2e-tests.conclusion }}
+
 runs:
     using: composite
     steps:
diff --git a/.github/actions/tests/slack-summary-on-release/slack-blocks/action.yml b/.github/actions/tests/slack-summary-on-release/slack-blocks/action.yml
new file mode 100644
index 00000000000..b98bd4d9aca
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-blocks/action.yml
@@ -0,0 +1,59 @@
+name: Compose a Slack block for release tests
+description: Create a Slack block that shows the API and E2E test results from one of the release tests, and upload it as an artifact.
+permissions: {}
+
+inputs:
+    test-name:
+        required: true
+    api-result:
+        required: true
+        type: choice
+        default: skipped
+        options:
+            - success
+            - failure
+            - cancelled
+            - skipped
+    e2e-result:
+        required: true
+        type: choice
+        default: skipped
+        options:
+            - success
+            - failure
+            - cancelled
+            - skipped
+    env-slug:
+        required: true
+    release-version:
+        required: true
+
+runs:
+    using: composite
+    steps:
+        - name: Create context block as a JSON object
+          id: generate-json
+          uses: actions/github-script@v6
+          with:
+              script: |
+                  const script = require('./.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block');
+                  return script();
+          env:
+              API_RESULT: ${{ inputs.api-result }}
+              E2E_RESULT: ${{ inputs.e2e-result }}
+              ENV_SLUG: ${{ inputs.env-slug }}
+              TEST_NAME: ${{ inputs.test-name }}
+              RELEASE_VERSION: ${{ inputs.release-version }}
+
+        - name: Write JSON file
+          working-directory: /tmp
+          shell: bash
+          env:
+              CONTEXT_JSON: ${{ toJSON(steps.generate-json.outputs.result) }}
+          run: echo ${{ env.CONTEXT_JSON }} > "${{ inputs.test-name }}.json"
+
+        - name: Upload JSON file as artifact
+          uses: actions/upload-artifact@v3
+          with:
+              name: ${{ env.SLACK_BLOCKS_ARTIFACT }}
+              path: /tmp/${{ inputs.test-name }}.json
diff --git a/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/index.js b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/index.js
new file mode 100644
index 00000000000..3e0e566d7ce
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/index.js
@@ -0,0 +1,31 @@
+module.exports = () => {
+	const { API_RESULT, E2E_RESULT, ENV_SLUG, TEST_NAME, RELEASE_VERSION } =
+		process.env;
+	const { setElementText } = require( './utils' );
+
+	const apiLinkText = setElementText( {
+		testType: 'API',
+		result: API_RESULT,
+		envSlug: ENV_SLUG,
+		releaseVersion: RELEASE_VERSION,
+	} );
+	const e2eLinkText = setElementText( {
+		testType: 'E2E',
+		result: E2E_RESULT,
+		envSlug: ENV_SLUG,
+		releaseVersion: RELEASE_VERSION,
+	} );
+	const elementText = `*${ TEST_NAME }*\n    ${ apiLinkText }    ${ e2eLinkText }`;
+
+	const contextBlock = {
+		type: 'context',
+		elements: [
+			{
+				type: 'mrkdwn',
+				text: elementText,
+			},
+		],
+	};
+
+	return contextBlock;
+};
diff --git a/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/index.js b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/index.js
new file mode 100644
index 00000000000..ebf13b1a2e1
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/index.js
@@ -0,0 +1,5 @@
+const { setElementText } = require( './set-element-text' );
+
+module.exports = {
+	setElementText,
+};
diff --git a/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/select-emoji.js b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/select-emoji.js
new file mode 100644
index 00000000000..a9ba564fe09
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/select-emoji.js
@@ -0,0 +1,26 @@
+const emojis = {
+	PASSED: ':workflow-passed:',
+	FAILED: ':workflow-failed:',
+	SKIPPED: ':workflow-skipped:',
+	CANCELLED: ':workflow-cancelled:',
+	UNKNOWN: ':grey_question:',
+};
+
+const selectEmoji = ( result ) => {
+	switch ( result ) {
+		case 'success':
+			return emojis.PASSED;
+		case 'failure':
+			return emojis.FAILED;
+		case 'skipped':
+			return emojis.SKIPPED;
+		case 'cancelled':
+			return emojis.CANCELLED;
+		default:
+			return emojis.UNKNOWN;
+	}
+};
+
+module.exports = {
+	selectEmoji,
+};
diff --git a/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/set-element-text.js b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/set-element-text.js
new file mode 100644
index 00000000000..6ea210d4259
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-blocks/scripts/create-result-block/utils/set-element-text.js
@@ -0,0 +1,12 @@
+const setElementText = ( { testType, result, envSlug, releaseVersion } ) => {
+	const { selectEmoji } = require( './select-emoji' );
+	const allureReportURL = `https://woocommerce.github.io/woocommerce-test-reports/release/${ releaseVersion }/${ envSlug }/${ testType.toLowerCase() }`;
+	const emoji = selectEmoji( result );
+	const textValue = `<${ allureReportURL }|${ testType.toUpperCase() } ${ emoji }>`;
+
+	return textValue;
+};
+
+module.exports = {
+	setElementText,
+};
diff --git a/.github/actions/tests/slack-summary-on-release/slack-payload/action.yml b/.github/actions/tests/slack-summary-on-release/slack-payload/action.yml
new file mode 100644
index 00000000000..a7cf1f3df7b
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-payload/action.yml
@@ -0,0 +1,27 @@
+name: Combine all Slack blocks
+description: Combine all Slack blocks to construct the payload for the Slack GitHub action
+permissions: {}
+
+inputs:
+    release-version:
+        required: true
+    blocks-dir:
+        require: true
+
+outputs:
+    payload:
+        value: ${{ steps.payload.outputs.result }}
+
+runs:
+    using: composite
+    steps:
+        - name: Construct payload from all blocks
+          id: payload
+          uses: actions/github-script@v6
+          env:
+              RELEASE_VERSION: ${{ inputs.release-version }}
+              BLOCKS_DIR: ${{ inputs.blocks-dir }}
+          with:
+              script: |
+                  const script = require('./.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload');
+                  return script();
diff --git a/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/index.js b/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/index.js
new file mode 100644
index 00000000000..a63633b314f
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/index.js
@@ -0,0 +1,36 @@
+module.exports = () => {
+	const { RELEASE_VERSION, BLOCKS_DIR } = process.env;
+	const {
+		filterContextBlocks,
+		readContextBlocksFromJsonFiles,
+	} = require( './utils' );
+
+	const headerText = `Test summary for ${ RELEASE_VERSION }`;
+	const headerBlock = {
+		type: 'header',
+		text: {
+			type: 'plain_text',
+			text: headerText,
+			emoji: true,
+		},
+	};
+
+	const blocks_all = readContextBlocksFromJsonFiles( BLOCKS_DIR );
+	const blocks_wcUpdate = filterContextBlocks( blocks_all, 'WC Update' );
+	const blocks_wpVersions = filterContextBlocks( blocks_all, 'WP Latest' );
+	const blocks_phpVersions = filterContextBlocks( blocks_all, 'PHP' );
+	const blocks_plugins = filterContextBlocks( blocks_all, 'With' );
+
+	const blocksPayload = [ headerBlock ]
+		.concat( blocks_wcUpdate )
+		.concat( blocks_wpVersions )
+		.concat( blocks_phpVersions )
+		.concat( blocks_plugins );
+
+	const payload = {
+		text: headerText,
+		blocks: blocksPayload,
+	};
+
+	return payload;
+};
diff --git a/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/utils/get-context-blocks.js b/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/utils/get-context-blocks.js
new file mode 100644
index 00000000000..338e45bafad
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/utils/get-context-blocks.js
@@ -0,0 +1,42 @@
+const fs = require( 'fs' );
+const path = require( 'path' );
+
+const readContextBlocksFromJsonFiles = ( blocksDir ) => {
+	const jsonsDir = path.resolve( blocksDir );
+	const jsons = fs.readdirSync( jsonsDir );
+
+	let contextBlocks = [];
+
+	for ( const json of jsons ) {
+		const jsonPath = path.resolve( jsonsDir, json );
+		const contextBlock = require( jsonPath );
+
+		contextBlocks.push( contextBlock );
+	}
+
+	return contextBlocks;
+};
+
+const filterContextBlocks = ( blocks, testName ) => {
+	const divider = {
+		type: 'divider',
+	};
+
+	let filteredBlocks = [];
+
+	const matchingBlocks = blocks.filter( ( { elements } ) =>
+		elements[ 0 ].text.includes( testName )
+	);
+
+	matchingBlocks.forEach( ( block ) => {
+		filteredBlocks.push( block );
+		filteredBlocks.push( divider );
+	} );
+
+	return filteredBlocks;
+};
+
+module.exports = {
+	filterContextBlocks,
+	readContextBlocksFromJsonFiles,
+};
diff --git a/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/utils/index.js b/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/utils/index.js
new file mode 100644
index 00000000000..dc773de7eb9
--- /dev/null
+++ b/.github/actions/tests/slack-summary-on-release/slack-payload/scripts/construct-payload/utils/index.js
@@ -0,0 +1,6 @@
+const {
+	filterContextBlocks,
+	readContextBlocksFromJsonFiles,
+} = require( './get-context-blocks' );
+
+module.exports = { filterContextBlocks, readContextBlocksFromJsonFiles };
diff --git a/.github/workflows/changelog-auto-add.yml b/.github/workflows/changelog-auto-add.yml
new file mode 100644
index 00000000000..1afd60511b3
--- /dev/null
+++ b/.github/workflows/changelog-auto-add.yml
@@ -0,0 +1,10 @@
+name: 'Changelog Auto Add'
+on: workflow_dispatch
+
+jobs:
+    hello-world:
+        name: 'Hello World'
+        runs-on: ubuntu-20.04
+        steps:
+            - name: Hello
+              run: echo "Hello World"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e58e5508c2..c9785c61b61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,23 +58,24 @@ jobs:
               working-directory: plugins/woocommerce
               run: pnpm run build:feature-config
 
-            - name: Add PHP8 Compatibility.
-              run: |
-                  if [ "$(php -r "echo version_compare(PHP_VERSION,'8.0','>=');")" ]; then
-                     cd plugins/woocommerce
-                     curl -L https://github.com/woocommerce/phpunit/archive/add-compatibility-with-php8-to-phpunit-7.zip -o /tmp/phpunit-7.5-fork.zip
-                     unzip -d /tmp/phpunit-7.5-fork /tmp/phpunit-7.5-fork.zip
-                     composer bin phpunit config --unset platform
-                     composer bin phpunit config repositories.0 '{"type": "path", "url": "/tmp/phpunit-7.5-fork/phpunit-add-compatibility-with-php8-to-phpunit-7", "options": {"symlink": false}}'
-                     composer bin phpunit require --dev -W phpunit/phpunit:@dev --ignore-platform-reqs
-                     rm -rf ./vendor/phpunit/
-                     composer dump-autoload
-                   fi
+            - id: parseMatrix
+              name: Parse Matrix Variables
+              uses: actions/github-script@v6
+              with:
+                script: |
+                    const parseWPVersion = require( './.github/workflows/scripts/parse-wp-version' );
+                    parseWPVersion( '${{ matrix.wp }}' ).then( ( version ) => {
+                      core.setOutput( 'wpVersion', version );
+                    } );
 
-            - name: Init DB and WP
-              working-directory: plugins/woocommerce
-              run: ./tests/bin/install.sh woo_test root root 127.0.0.1 ${{ matrix.wp }}
+            - name: Prepare Testing Environment
+              env:
+                WP_ENV_CORE: ${{ steps.parseMatrix.outputs.wpVersion }}
+                WP_ENV_PHP_VERSION: ${{ matrix.php }}
+              run: pnpm --filter=woocommerce env:test
 
-            - name: Run tests
-              working-directory: plugins/woocommerce
-              run: pnpm run test --color
+            - name: Run Tests
+              env:
+                WP_ENV_CORE: ${{ steps.parseMatrix.outputs.wpVersion }}
+                WP_ENV_PHP_VERSION: ${{ matrix.php }}
+              run: pnpm --filter=woocommerce test:unit:env
diff --git a/.github/workflows/pr-build-and-e2e-tests.yml b/.github/workflows/pr-build-and-e2e-tests.yml
index 0ddad0d4617..bcb64f055a0 100644
--- a/.github/workflows/pr-build-and-e2e-tests.yml
+++ b/.github/workflows/pr-build-and-e2e-tests.yml
@@ -13,7 +13,6 @@ permissions: {}
 
 jobs:
     e2e-tests-run:
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.user.login != 'github-actions[bot]' }}
         name: Runs E2E tests.
         runs-on: ubuntu-20.04
         permissions:
@@ -85,7 +84,6 @@ jobs:
 
     api-tests-run:
         name: Runs API tests.
-        if: github.event.pull_request.user.login != 'github-actions[bot]'
         runs-on: ubuntu-20.04
         permissions:
             contents: read
diff --git a/.github/workflows/pr-code-coverage.yml b/.github/workflows/pr-code-coverage.yml
deleted file mode 100644
index 3df9ef1d464..00000000000
--- a/.github/workflows/pr-code-coverage.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: Run code coverage on PR
-on:
-    pull_request:
-        paths-ignore:
-            - '**/changelog/**'
-    workflow_dispatch:
-defaults:
-    run:
-        shell: bash
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: true
-
-permissions: {}
-
-jobs:
-    test:
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.user.login != 'github-actions[bot]' }}
-        name: Code coverage (PHP 7.4, WP Latest)
-        timeout-minutes: 30
-        runs-on: ubuntu-20.04
-        permissions:
-            contents: read
-        services:
-            database:
-                image: mysql:5.6
-                env:
-                    MYSQL_ROOT_PASSWORD: root
-                ports:
-                    - 3306:3306
-                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  fetch-depth: 100
-
-            - name: Setup WooCommerce Monorepo
-              uses: ./.github/actions/setup-woocommerce-monorepo
-
-            - name: Tool versions
-              run: |
-                  php --version
-                  composer --version
-
-            - name: Build Admin feature config
-              working-directory: plugins/woocommerce
-              run: pnpm run build:feature-config
-
-            - name: Init DB and WP
-              working-directory: plugins/woocommerce
-              run: bash tests/bin/install.sh woo_test root root 127.0.0.1 latest
-
-            - name: Run unit tests with code coverage. Allow to fail.
-              working-directory: plugins/woocommerce
-              run: |
-                  RUN_CODE_COVERAGE=1 bash tests/bin/phpunit.sh
-                  exit 0
-
-            - name: Send code coverage to Codecov.
-              run: |
-                  bash <(curl -s https://codecov.io/bash)
diff --git a/.github/workflows/pr-code-sniff.yml b/.github/workflows/pr-code-sniff.yml
index 6026b2cd18e..7578e652db6 100644
--- a/.github/workflows/pr-code-sniff.yml
+++ b/.github/workflows/pr-code-sniff.yml
@@ -16,7 +16,6 @@ permissions: {}
 
 jobs:
     test:
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.user.login != 'github-actions[bot]' }}
         name: Code sniff (PHP 7.4, WP Latest)
         timeout-minutes: 15
         runs-on: ubuntu-20.04
diff --git a/.github/workflows/pr-highlight-changes.yml b/.github/workflows/pr-highlight-changes.yml
index a43759ca526..e5f0e8bd563 100644
--- a/.github/workflows/pr-highlight-changes.yml
+++ b/.github/workflows/pr-highlight-changes.yml
@@ -8,7 +8,7 @@ permissions: {}
 
 jobs:
     analyze:
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.user.login != 'github-actions[bot]' }}
+        if: ${{ github.event.pull_request.user.login != 'github-actions[bot]' }}
         name: Check pull request changes to highlight
         runs-on: ubuntu-20.04
         permissions:
diff --git a/.github/workflows/pr-lint-monorepo.yml b/.github/workflows/pr-lint-monorepo.yml
index b456ecb82ea..684e8ca1ebd 100644
--- a/.github/workflows/pr-lint-monorepo.yml
+++ b/.github/workflows/pr-lint-monorepo.yml
@@ -11,7 +11,6 @@ permissions: {}
 
 jobs:
     changelogger_used:
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.user.login != 'github-actions[bot]' }}
         name: Changelogger use
         runs-on: ubuntu-20.04
         permissions:
diff --git a/.github/workflows/pr-lint-test-js.yml b/.github/workflows/pr-lint-test-js.yml
index 9cbfcbd3659..972367f0abd 100644
--- a/.github/workflows/pr-lint-test-js.yml
+++ b/.github/workflows/pr-lint-test-js.yml
@@ -12,7 +12,6 @@ permissions: {}
 
 jobs:
     lint-test-js:
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.user.login != 'github-actions[bot]' }}
         name: Lint and Test JS
         runs-on: ubuntu-20.04
         permissions:
diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml
index cda4e690a7d..3afbd0be4b7 100644
--- a/.github/workflows/pr-unit-tests.yml
+++ b/.github/workflows/pr-unit-tests.yml
@@ -14,7 +14,7 @@ permissions: {}
 
 jobs:
     test:
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.user.login != 'github-actions[bot]' }}
+        if: ${{ github.event.pull_request.user.login != 'github-actions[bot]' }}
         name: PHP ${{ matrix.php }} WP ${{ matrix.wp }} ${{ matrix.hpos && 'HPOS' || '' }}
         timeout-minutes: 30
         runs-on: ubuntu-20.04
@@ -52,15 +52,24 @@ jobs:
               with:
                   php-version: ${{ matrix.php }}
 
-            - name: Tool versions
-              run: |
-                  php --version
-                  composer --version
+            - id: parseMatrix
+              name: Parse Matrix Variables
+              uses: actions/github-script@v6
+              with:
+                script: |
+                    const parseWPVersion = require( './.github/workflows/scripts/parse-wp-version' );
+                    parseWPVersion( '${{ matrix.wp }}' ).then( ( version ) => {
+                      core.setOutput( 'wpVersion', version );
+                    } );
 
-            - name: Init DB and WP
-              working-directory: plugins/woocommerce
-              run: ./tests/bin/install.sh woo_test root root 127.0.0.1 ${{ matrix.wp }}
+            - name: Prepare Testing Environment
+              env:
+                WP_ENV_CORE: ${{ steps.parseMatrix.outputs.wpVersion }}
+                WP_ENV_PHP_VERSION: ${{ matrix.php }}
+              run: pnpm --filter=woocommerce env:test
 
-            - name: Run tests
-              working-directory: plugins/woocommerce
-              run: pnpm run test --filter=woocommerce --color
+            - name: Run Tests
+              env:
+                WP_ENV_CORE: ${{ steps.parseMatrix.outputs.wpVersion }}
+                WP_ENV_PHP_VERSION: ${{ matrix.php }}
+              run: pnpm --filter=woocommerce test:unit:env
diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml
deleted file mode 100644
index ab77d208efb..00000000000
--- a/.github/workflows/release-changelog.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-name: 'Release: Generate changelog'
-on:
-    workflow_dispatch:
-        inputs:
-            releaseBranch:
-                description: 'The name of the release branch, in the format `release/x.y`'
-                required: true
-            releaseVersion:
-                description: 'The version of the release, in the format `x.y`'
-                required: true
-
-env:
-    GIT_COMMITTER_NAME: 'WooCommerce Bot'
-    GIT_COMMITTER_EMAIL: 'no-reply@woocommerce.com'
-    GIT_AUTHOR_NAME: 'WooCommerce Bot'
-    GIT_AUTHOR_EMAIL: 'no-reply@woocommerce.com'
-
-permissions: {}
-
-jobs:
-    create-changelog-prs:
-        runs-on: ubuntu-20.04
-        permissions:
-            contents: write
-            pull-requests: write
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v3
-              with:
-                  fetch-depth: 0
-
-            - name: Setup WooCommerce Monorepo
-              uses: ./.github/actions/setup-woocommerce-monorepo
-              with:
-                  build: false
-
-            - name: 'Git fetch the release branch'
-              run: git fetch origin ${{ inputs.releaseBranch }}
-
-            - name: 'Checkout the release branch'
-              run: git checkout ${{ inputs.releaseBranch }}
-
-            - name: 'Create a new branch for the changelog update PR'
-              run: git checkout -b ${{ format( 'update/{0}-changelog', inputs.releaseVersion ) }}
-
-            - name: 'Generate the changelog file'
-              run: pnpm --filter=woocommerce run changelog write --add-pr-num -n -vvv --use-version ${{ inputs.releaseVersion }}
-
-            - name: Checkout pnpm-lock.yaml to prevent issues
-              run: git checkout pnpm-lock.yaml
-
-            - name: 'git rm deleted files'
-              run: git rm $(git ls-files --deleted)
-
-            - name: 'Commit deletion'
-              run: git commit -m "Delete changelog files from ${{ inputs.releaseVersion }} release"
-
-            - name: 'Remember the deletion commit hash'
-              id: rev-parse
-              run: echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
-            - name: 'Insert NEXT_CHANGELOG contents into readme.txt'
-              run: php .github/workflows/scripts/release-changelog.php
-
-            - name: 'git add readme.txt'
-              run: git add plugins/woocommerce/readme.txt
-
-            - name: 'Commit readme'
-              run: git commit -m "Update the readme files for the ${{ inputs.releaseVersion }} release"
-
-            - name: 'Push update branch to origin'
-              run: git push origin ${{ format( 'update/{0}-changelog', inputs.releaseVersion ) }}
-
-            - name: 'Stash any other undesired changes'
-              run: git stash
-
-            - name: 'Checkout trunk'
-              run: git checkout trunk
-
-            - name: 'Create a branch for the changelog files deletion'
-              run: git checkout -b ${{ format( 'delete/{0}-changelog', inputs.releaseVersion ) }}
-
-            - name: 'Cherry-pick the deletion commit'
-              run: git cherry-pick ${{ steps.rev-parse.outputs.hash }}
-
-            - name: 'Push deletion branch to origin'
-              run: git push origin ${{ format( 'delete/{0}-changelog', inputs.releaseVersion ) }}
-
-            - name: 'Create release branch PR'
-              id: release-pr
-              uses: actions/github-script@v6
-              with:
-                  script: |
-                      const result = await github.rest.pulls.create( {
-                        owner: "${{ github.repository_owner }}",
-                        repo: "${{ github.event.repository.name }}",
-                        head: "${{ format( 'update/{0}-changelog', inputs.releaseVersion ) }}",
-                        base: "${{ inputs.releaseBranch }}",
-                        title: "${{ format( 'Release: Prepare the changelog for {0}', inputs.releaseVersion ) }}",
-                        body: "${{ format( 'This pull request was automatically generated during the code freeze to prepare the changelog for {0}', inputs.releaseVersion ) }}"
-                      } );
-
-                      return result.data.number;
-
-            - name: 'Create trunk PR'
-              id: trunk-pr
-              uses: actions/github-script@v6
-              with:
-                  script: |
-                      const result = await github.rest.pulls.create( {
-                        owner: "${{ github.repository_owner }}",
-                        repo: "${{ github.event.repository.name }}",
-                        head: "${{ format( 'delete/{0}-changelog', inputs.releaseVersion ) }}",
-                        base: "trunk",
-                        title: "${{ format( 'Release: Remove {0} change files', inputs.releaseVersion ) }}",
-                        body: "${{ format( 'This pull request was automatically generated during the code freeze to remove the changefiles from {0} that are compiled into the `{1}` branch via #{2}', inputs.releaseVersion, inputs.releaseBranch, steps.release-pr.outputs.result ) }}"
-                      } );
-
-                      return result.data.number;
diff --git a/.github/workflows/release-code-freeze.yml b/.github/workflows/release-code-freeze.yml
index 76bca3ca8d8..a67806047f4 100644
--- a/.github/workflows/release-code-freeze.yml
+++ b/.github/workflows/release-code-freeze.yml
@@ -41,10 +41,24 @@ jobs:
               with:
                   fetch-depth: 0
 
+            - name: Setup PNPM
+              uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd
+              with:
+                  version: '8.3.1'
+
+            - name: Setup Node
+              uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
+              with:
+                  node-version-file: .nvmrc
+                  cache: pnpm
+                  registry-url: 'https://registry.npmjs.org'
+
             - name: Install prerequisites
               run: |
-                  npm install -g pnpm
-                  pnpm install --filter monorepo-utils
+                  pnpm install --filter monorepo-utils --ignore-scripts
+                  # ignore scripts speeds up setup signficantly, but we still need to build monorepo utils
+                  pnpm build
+              working-directory: tools/monorepo-utils
 
             - name: 'Check whether today is the code freeze day'
               id: check-freeze
@@ -71,42 +85,47 @@ jobs:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: pnpm run utils code-freeze version-bump -o ${{ github.repository_owner }} -v ${{ steps.milestone.outputs.nextDevelopmentVersion }}.0-dev
 
+            - name: Generate changelog changes
+              id: changelog
+              if: steps.check-freeze.outputs.freeze == 'true'
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: pnpm run utils code-freeze changelog -o ${{ github.repository_owner }} -v ${{ steps.milestone.outputs.nextReleaseVersion }}
+
     notify-slack:
         name: 'Sends code freeze notification to Slack'
         runs-on: ubuntu-20.04
         needs: code-freeze-prep
-        if: ${{ inputs.skipSlackPing != true }}
+        if: ${{ needs.code-freeze-prep.outputs.freeze == 'true' && inputs.skipSlackPing != true }}
         steps:
+            - name: Checkout code
+              uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0
+
+            - name: Setup PNPM
+              uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd
+              with:
+                  version: '8.3.1'
+
+            - name: Setup Node
+              uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
+              with:
+                  node-version-file: .nvmrc
+                  cache: pnpm
+                  registry-url: 'https://registry.npmjs.org'
+
+            - name: Install prerequisites
+              run: |
+                  pnpm install --filter monorepo-utils --ignore-scripts
+                  # ignore scripts speeds up setup signficantly, but we still need to build monorepo utils
+                  pnpm build
+              working-directory: tools/monorepo-utils
+
             - name: Slack
-              uses: archive/github-actions-slack@v2.0.0
               id: notify
-              with:
-                  slack-bot-user-oauth-access-token: ${{ secrets.CODE_FREEZE_BOT_TOKEN }}
-                  slack-channel: ${{ inputs.slackChannelOverride || secrets.WOO_RELEASE_SLACK_CHANNEL }}
-                  slack-text: |
-                      :warning-8c: ${{ needs.code-freeze-prep.outputs.nextReleaseVersion }} Code Freeze :ice_cube:
-
-                      The automation to cut the release branch for ${{ needs.code-freeze-prep.outputs.nextReleaseVersion }} has run. Any PRs that were not already merged will be a part of ${{ needs.maybe-create-next-milestone-and-release-branch.outputs.nextDevelopmentVersion }} by default. If you have something that needs to make ${{ needs.maybe-create-next-milestone-and-release-branch.outputs.nextReleaseVersion }} that hasn't yet been merged, please see the <${{ secrets.FG_LINK }}/code-freeze-for-woocommerce-core-release/|fieldguide page for the code freeze>.
-
-    trigger-changelog-action:
-        name: 'Trigger changelog action'
-        runs-on: ubuntu-20.04
-        permissions:
-            actions: write
-        needs: code-freeze-prep
-        if: needs.code-freeze-prep.outputs.freeze == 'true'
-        steps:
-            - name: 'Trigger changelog action'
-              uses: actions/github-script@v6
-              with:
-                  script: |
-                      github.rest.actions.createWorkflowDispatch({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        workflow_id: 'release-changelog.yml',
-                        ref: 'trunk',
-                        inputs: {
-                          releaseVersion: "${{ needs.code-freeze-prep.outputs.nextReleaseVersion }}",
-                          releaseBranch: "${{ needs.code-freeze-prep.outputs.nextReleaseBranch }}"
-                        }
-                      })
+              run: |
+                  pnpm utils slack "${{ secrets.CODE_FREEZE_BOT_TOKEN }}" "
+                  :warning-8c: ${{ needs.code-freeze-prep.outputs.nextReleaseVersion }} Code Freeze :ice_cube:
+                  The automation to cut the release branch for ${{ needs.code-freeze-prep.outputs.nextReleaseVersion }} has run. Any PRs that were not already merged will be a part of ${{ needs.code-freeze-prep.outputs.nextDevelopmentVersion }} by default. If you have something that needs to make ${{ needs.code-freeze-prep.outputs.nextReleaseVersion }} that hasn't yet been merged, please see the <${{ secrets.FG_LINK }}/code-freeze-for-woocommerce-core-release/|fieldguide page for the code freeze>.
+                  " "${{ inputs.slackChannelOverride || secrets.WOO_RELEASE_SLACK_CHANNEL }}"
diff --git a/.github/workflows/scripts/parse-wp-version.js b/.github/workflows/scripts/parse-wp-version.js
new file mode 100644
index 00000000000..f3f3c420368
--- /dev/null
+++ b/.github/workflows/scripts/parse-wp-version.js
@@ -0,0 +1,89 @@
+const https = require( 'http' );
+
+/**
+	For convenience, this method will convert between a display-friendly version format and one used
+	internally by wp-env. We lean towards using WordPress.org ZIPs which requires us to reference
+	the full URL to the archive. For instance, instead of needing the action to fully define the
+	URL to the nightly build we can pass "nightly" to this function and retrieve it.
+	
+	@param {string} wpVersion The display-friendly version. Supports ("master", "trunk", "nightly",
+				  "latest", "X.X" for version lines, and "X.X.X" for specific versions)
+	@return {Promise.<string>} The wp-env "core" property".
+**/
+module.exports = async function parseWPVersion( wpVersion ) {
+    	// Start with versions we can infer immediately.
+	switch ( wpVersion ) {
+        	case 'master':
+		case 'trunk': {
+			return 'WordPress/WordPress#master';
+		}
+
+		case 'nightly': {
+			return 'https://wordpress.org/nightly-builds/wordpress-latest.zip';
+		}
+
+		case 'latest': {
+			return 'https://wordpress.org/latest.zip';
+		}
+	}
+
+	return new Promise( ( resolve, reject ) => {
+		// We're going to download the correct zip archive based on the version they're requesting.
+		const parsedVersion = wpVersion.match( /([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/ );
+		if ( ! parsedVersion ) {
+			throw new Error( `Invalid 'wp-version': ${ wpVersion } must be 'trunk', 'nightly', 'latest', 'X.X', or 'X.X.X'.` );
+		}
+
+		// When they've provided a specific version we can just provide that.
+		if ( parsedVersion[ 3 ] !== undefined ) {
+			let zipVersion = `${ parsedVersion[ 1 ] }.${ parsedVersion[ 2 ] }`;
+			// .0 versions do not have a patch.
+			if ( parsedVersion[ 3 ] !== '0' ) {
+				zipVersion += `.${ parsedVersion[ 3 ] }`;
+			}
+
+			resolve( `https://wordpress.org/wordpress-${ zipVersion }.zip` );
+		}
+
+		const request = https.get(
+			'http://api.wordpress.org/core/stable-check/1.0/',
+			( response ) => {
+				// Listen for the response data.
+				let data = '';
+				response.on('data', (chunk) => {
+					data += chunk;
+				});
+
+				// Once we have the entire response we can process it.
+				response.on('end', () => {
+					// Parse the response and find the latest version of every minor release.
+					const latestVersions = {};
+					const rawVersions = JSON.parse( data );
+					for ( const v in rawVersions ) {
+						// Parse the version so we can find the latest.
+						const matches = v.match( /([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/ );
+						const minor = `${ matches[1] }.${ matches[2] }`;
+						const patch = matches[ 3 ] === undefined ? 0 : parseInt( matches[ 3 ] );
+
+						// We will only be keeping the latest release of each minor.
+						if ( latestVersions[ minor ] === undefined || patch > latestVersions[ minor ] ) {
+							latestVersions[ minor ] = patch;
+						}
+					}
+
+					let zipVersion = `${ parsedVersion[ 1 ] }.${ parsedVersion[ 2 ] }`;
+					// .0 versions do not have a patch.
+					if ( latestVersions[ zipVersion ] !== 0 ) {
+						zipVersion += `.${ latestVersions[ zipVersion ]}`;
+					}
+
+					resolve( `https://wordpress.org/wordpress-${ zipVersion }.zip` );
+				});
+			},
+		);
+
+		request.on( 'error', ( error ) => {
+			reject( error );
+		} );
+	} );
+}
diff --git a/.github/workflows/scripts/post-request-shared.php b/.github/workflows/scripts/post-request-shared.php
index 67a6794feef..8d4bc442147 100644
--- a/.github/workflows/scripts/post-request-shared.php
+++ b/.github/workflows/scripts/post-request-shared.php
@@ -135,7 +135,7 @@ function get_latest_version_with_release() {
 }
 
 /**
- * Function to retreive the sha1 reference for a given branch name.
+ * Function to retrieve the sha1 reference for a given branch name.
  *
  * @param string $branch The name of the branch.
  * @return string Returns the name of the branch, or a falsey value on error.
diff --git a/.github/workflows/smoke-test-daily.yml b/.github/workflows/smoke-test-daily.yml
index e91f8482ed0..7e989fafea0 100644
--- a/.github/workflows/smoke-test-daily.yml
+++ b/.github/workflows/smoke-test-daily.yml
@@ -48,7 +48,7 @@ jobs:
               working-directory: plugins/woocommerce
               env:
                   UPDATE_WC: nightly
-              run: pnpm exec playwright test --config=tests/e2e-pw/daily.playwright.config.js update-woocommerce.spec.js
+              run: pnpm exec playwright test --config=tests/e2e-pw/playwright.config.js update-woocommerce.spec.js
 
             - name: Run API tests.
               working-directory: plugins/woocommerce
@@ -200,15 +200,17 @@ jobs:
                     - plugin: 'WooCommerce Subscriptions'
                       repo: WC_SUBSCRIPTIONS_REPO
                       private: true
-                    - plugin: 'WordPress SEO' # Yoast SEO in the UI, but the slug is wordpress-seo
-                      repo: 'Yoast/wordpress-seo'
-                    - plugin: 'Contact Form 7'
-                      repo: 'takayukister/contact-form-7'
+                    - plugin: 'Gutenberg'
+                      repo: 'WordPress/gutenberg'
+                    - plugin: 'Gutenberg - Nightly'
+                      repo: 'bph/gutenberg'
         steps:
             - uses: actions/checkout@v3
 
             - name: Setup WooCommerce Monorepo
               uses: ./.github/actions/setup-woocommerce-monorepo
+              with:
+                  build-filters: woocommerce
 
             - name: Launch wp-env e2e environment
               working-directory: plugins/woocommerce
@@ -224,13 +226,13 @@ jobs:
                   PLUGIN_REPOSITORY: ${{ matrix.private && secrets[matrix.repo] || matrix.repo }}
                   PLUGIN_NAME: ${{ matrix.plugin }}
                   GITHUB_TOKEN: ${{ secrets.E2E_GH_TOKEN }}
-              run: pnpm exec playwright test --config=tests/e2e-pw/playwright.config.js upload-plugin.spec.js
+              run: pnpm test:e2e-pw upload-plugin.spec.js
 
             - name: Run the rest of E2E tests
               working-directory: plugins/woocommerce
               env:
                   E2E_MAX_FAILURES: 15
-              run: pnpm exec playwright test --config=tests/e2e-pw/playwright.config.js
+              run: pnpm test:e2e-pw
 
             - name: Generate E2E Test report.
               if: success() || failure()
@@ -321,36 +323,29 @@ jobs:
             matrix:
                 include:
                     - plugin: 'WooCommerce Payments'
-                      repo: 'automattic/woocommerce-payments'
+                      slug: woocommerce-payments
                     - plugin: 'WooCommerce PayPal Payments'
-                      repo: 'woocommerce/woocommerce-paypal-payments'
+                      slug: woocommerce-paypal-payments
                     - plugin: 'WooCommerce Shipping & Tax'
-                      repo: 'automattic/woocommerce-services'
-                    - plugin: 'WordPress SEO' # Yoast SEO in the UI, but the slug is wordpress-seo
-                      repo: 'Yoast/wordpress-seo'
-                    - plugin: 'Contact Form 7'
-                      repo: 'takayukister/contact-form-7'
+                      slug: woocommerce-services
+                    - plugin: 'WooCommerce Subscriptions'
+                      slug: woocommerce-subscriptions
+                    - plugin: 'Gutenberg'
+                      slug: gutenberg
+                    - plugin: 'Gutenberg - Nightly'
+                      slug: gutenberg-nightly
         steps:
             - name: Download test report artifact
               uses: actions/download-artifact@v3
               with:
                   name: ${{ env.ARTIFACT }}
 
-            # TODO: Add step to post job summary
-
-            - name: Get slug
-              id: get-slug
-              uses: actions/github-script@v6
-              with:
-                  result-encoding: string
-                  script: return "${{ matrix.repo }}".split( '/' ).pop()
-
             - name: Publish reports
               run: |
                   gh workflow run publish-test-reports-daily-plugins.yml \
                     -f run_id=$RUN_ID \
                     -f artifact="${{ env.ARTIFACT }}" \
                     -f plugin="${{ matrix.plugin }}" \
-                    -f slug="${{ steps.get-slug.outputs.result }}" \
+                    -f slug="${{ matrix.slug }}" \
                     -f s3_root=public \
                     --repo woocommerce/woocommerce-test-reports
diff --git a/.github/workflows/smoke-test-release.yml b/.github/workflows/smoke-test-release.yml
index bc07de36ba7..afa0adc319a 100644
--- a/.github/workflows/smoke-test-release.yml
+++ b/.github/workflows/smoke-test-release.yml
@@ -14,7 +14,7 @@ permissions: {}
 env:
     E2E_WP_LATEST_ARTIFACT: E2E test on release smoke test site with WP Latest (run ${{ github.run_number }})
     E2E_UPDATE_WC_ARTIFACT: WooCommerce version update test on release smoke test site (run ${{ github.run_number }})
-
+    SLACK_BLOCKS_ARTIFACT: slack-blocks
 jobs:
     get-tag:
         name: Get WooCommerce release tag
@@ -122,12 +122,26 @@ jobs:
                     -f test_type="e2e" \
                     --repo woocommerce/woocommerce-test-reports
 
+            - name: Create Slack block
+              if: |
+                  success() || (
+                    failure() && steps.run-e2e-composite-action.outputs.result == 'failure'
+                  )
+              uses: ./.github/actions/tests/slack-summary-on-release/slack-blocks
+              with:
+                  test-name: WC Update test
+                  e2e-result: ${{ steps.run-e2e-composite-action.outputs.result }}
+                  env-slug: wp-latest
+                  release-version: ${{ needs.get-tag.outputs.tag }}
+
     api-wp-latest:
         name: API on WP Latest
         runs-on: ubuntu-20.04
         needs: [get-tag, e2e-update-wc]
         permissions:
             contents: read
+        outputs:
+            result: ${{ steps.run-api-composite-action.outputs.result }}
         env:
             ALLURE_REPORT_DIR: ${{ github.workspace }}/plugins/woocommerce/tests/api-core-tests/api-test-report/allure-report
             ALLURE_RESULTS_DIR: ${{ github.workspace }}/plugins/woocommerce/tests/api-core-tests/api-test-report/allure-results
@@ -178,6 +192,18 @@ jobs:
                     -f test_type="api" \
                     --repo woocommerce/woocommerce-test-reports
 
+            - name: Create Slack block
+              if: |
+                  success() || (
+                    failure() && steps.run-api-composite-action.outputs.result == 'failure'
+                  )
+              uses: ./.github/actions/tests/slack-summary-on-release/slack-blocks
+              with:
+                  test-name: WP Latest
+                  api-result: ${{ steps.run-api-composite-action.outputs.result }}
+                  env-slug: wp-latest
+                  release-version: ${{ needs.get-tag.outputs.tag }}
+
     e2e-wp-latest:
         name: E2E on WP Latest
         runs-on: ubuntu-20.04
@@ -268,6 +294,19 @@ jobs:
                     -f test_type="e2e" \
                     --repo woocommerce/woocommerce-test-reports
 
+            - name: Create Slack block
+              if: |
+                  success() || (
+                    failure() && steps.run-e2e-composite-action.outputs.result == 'failure'
+                  )
+              uses: ./.github/actions/tests/slack-summary-on-release/slack-blocks
+              with:
+                  test-name: WP Latest
+                  api-result: ${{ needs.api-wp-latest.outputs.result }}
+                  e2e-result: ${{ steps.run-e2e-composite-action.outputs.result }}
+                  env-slug: wp-latest
+                  release-version: ${{ needs.get-tag.outputs.tag }}
+
     get-wp-versions:
         name: Get WP L-1 & L-2 version numbers
         needs: [get-tag]
@@ -328,6 +367,8 @@ jobs:
 
             - name: Setup WooCommerce Monorepo
               uses: ./.github/actions/setup-woocommerce-monorepo
+              with:
+                  build-filters: woocommerce
 
             - name: Launch WP Env
               working-directory: plugins/woocommerce
@@ -360,7 +401,7 @@ jobs:
               uses: ./.github/actions/tests/run-api-tests
               with:
                   report-name: ${{ env.API_WP_LATEST_X_ARTIFACT }}
-                  tests: hello
+                  tests: hello.test.js
               env:
                   ALLURE_RESULTS_DIR: ${{ env.API_ALLURE_RESULTS_DIR }}
                   ALLURE_REPORT_DIR: ${{ env.API_ALLURE_REPORT_DIR }}
@@ -435,6 +476,22 @@ jobs:
                     -f test_type="e2e" \
                     --repo woocommerce/woocommerce-test-reports
 
+            - name: Create Slack block
+              if: |
+                  success() || (
+                    failure() && (
+                      steps.run-api-composite-action.outputs.result == 'failure' ||
+                      steps.run-e2e-composite-action.outputs.result == 'failure' 
+                    ) 
+                  )
+              uses: ./.github/actions/tests/slack-summary-on-release/slack-blocks
+              with:
+                  test-name: ${{ matrix.version.description }} (${{ matrix.version.number }})
+                  api-result: ${{ steps.run-api-composite-action.outputs.result }}
+                  e2e-result: ${{ steps.run-e2e-composite-action.outputs.result }}
+                  env-slug: ${{ matrix.version.env_description }}
+                  release-version: ${{ needs.get-wp-versions.outputs.tag }}
+
     test-php-versions:
         name: Test against PHP ${{ matrix.php_version }}
         runs-on: ubuntu-20.04
@@ -456,6 +513,8 @@ jobs:
 
             - name: Setup WooCommerce Monorepo
               uses: ./.github/actions/setup-woocommerce-monorepo
+              with:
+                  build-filters: woocommerce
 
             - name: Launch WP Env
               working-directory: plugins/woocommerce
@@ -482,7 +541,7 @@ jobs:
               uses: ./.github/actions/tests/run-api-tests
               with:
                   report-name: ${{ env.API_ARTIFACT }}
-                  tests: hello
+                  tests: hello.test.js
               env:
                   ALLURE_RESULTS_DIR: ${{ env.API_ALLURE_RESULTS_DIR }}
                   ALLURE_REPORT_DIR: ${{ env.API_ALLURE_REPORT_DIR }}
@@ -557,6 +616,22 @@ jobs:
                     -f test_type="e2e" \
                     --repo woocommerce/woocommerce-test-reports
 
+            - name: Create Slack block
+              if: |
+                  success() || (
+                    failure() && (
+                      steps.run-api-composite-action.outputs.result == 'failure' ||
+                      steps.run-e2e-composite-action.outputs.result == 'failure' 
+                    )
+                  )
+              uses: ./.github/actions/tests/slack-summary-on-release/slack-blocks
+              with:
+                  test-name: PHP ${{ matrix.php_version }}
+                  api-result: ${{ steps.run-api-composite-action.outputs.result }}
+                  e2e-result: ${{ steps.run-e2e-composite-action.outputs.result }}
+                  env-slug: php-${{ matrix.php_version }}
+                  release-version: ${{ needs.get-tag.outputs.tag }}
+
     test-plugins:
         name: With ${{ matrix.plugin }}
         runs-on: ubuntu-20.04
@@ -582,18 +657,20 @@ jobs:
                       repo: WC_SUBSCRIPTIONS_REPO
                       private: true
                       env_description: 'woocommerce-subscriptions'
-                    - plugin: 'WordPress SEO' # Yoast SEO in the UI, but the slug is wordpress-seo
-                      repo: 'Yoast/wordpress-seo'
-                      env_description: 'wordpress-seo'
-                    - plugin: 'Contact Form 7'
-                      repo: 'takayukister/contact-form-7'
-                      env_description: 'contact-form-7'
+                    - plugin: 'Gutenberg'
+                      repo: 'WordPress/gutenberg'
+                      env_description: 'gutenberg'
+                    - plugin: 'Gutenberg - Nightly'
+                      repo: 'bph/gutenberg'
+                      env_description: 'gutenberg-nightly'
         steps:
             - name: Checkout
               uses: actions/checkout@v3
 
             - name: Setup WooCommerce Monorepo
               uses: ./.github/actions/setup-woocommerce-monorepo
+              with:
+                  build-filters: woocommerce
 
             - name: Launch WP Env
               working-directory: plugins/woocommerce
@@ -656,3 +733,54 @@ jobs:
                     -f env_description="${{ matrix.env_description }}" \
                     -f test_type="e2e" \
                     --repo woocommerce/woocommerce-test-reports
+
+            - name: Create Slack block
+              if: |
+                  success() || (
+                    failure() && steps.run-e2e-composite-action.outputs.result == 'failure' )
+              uses: ./.github/actions/tests/slack-summary-on-release/slack-blocks
+              with:
+                  test-name: With ${{ matrix.plugin }}
+                  e2e-result: ${{ steps.run-e2e-composite-action.outputs.result }}
+                  env-slug: ${{ matrix.env_description }}
+                  release-version: ${{ needs.get-tag.outputs.tag }}
+
+    post-slack-summary:
+        name: Post Slack summary
+        runs-on: ubuntu-20.04
+        permissions:
+            contents: read
+        if: |
+            success() || (
+              failure() && contains( needs.*.result, 'failure' )
+            )
+        needs:
+            - e2e-wp-latest
+            - get-tag
+            - test-php-versions
+            - test-plugins
+            - test-wp-versions
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Download all slack blocks
+              id: download-slack-blocks
+              uses: actions/download-artifact@v3
+              with:
+                  name: ${{ env.SLACK_BLOCKS_ARTIFACT }}
+                  path: /tmp/slack-payload
+
+            - name: Construct payload from all blocks
+              id: run-payload-action
+              uses: ./.github/actions/tests/slack-summary-on-release/slack-payload
+              with:
+                  release-version: ${{ needs.get-tag.outputs.tag }}
+                  blocks-dir: ${{ steps.download-slack-blocks.outputs.download-path }}
+
+            - name: Send Slack message
+              uses: slackapi/slack-github-action@v1.23.0
+              with:
+                  channel-id: ${{ secrets.RELEASE_TEST_SLACK_CHANNEL }}
+                  payload: ${{ steps.run-payload-action.outputs.payload }}
+              env:
+                  SLACK_BOT_TOKEN: ${{ secrets.E2E_SLACK_TOKEN }}
diff --git a/.syncpackrc b/.syncpackrc
index 832c6f62e33..baf0716cbc6 100644
--- a/.syncpackrc
+++ b/.syncpackrc
@@ -78,7 +78,6 @@
 				"@wordpress/eslint-plugin",
 				"@wordpress/babel-plugin-import-jsx-pragma",
 				"@wordpress/babel-preset-default",
-				"@wordpress/env",
 				"@wordpress/stylelint-config",
 				"@wordpress/prettier-config",
 				"@wordpress/scripts",
@@ -116,6 +115,15 @@
 			],
 			"isIgnored": true
 		},
+		{
+			"dependencies": [
+				"@wordpress/env"
+			],
+			"packages": [
+				"**"
+			],
+			"pinVersion": "^7.0.0"
+		},
 		{
 			"dependencies": [
 				"@wordpress/**"
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index c531e6f45a9..cb3671f4066 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -23,26 +23,26 @@ Here are some examples of the ways you can use Turborepo / pnpm commands:
 ```bash
 # Lint and build all plugins, packages, and tools. Note the use of `-r` for lint,
 # turbo does not run the lint at this time.
-pnpm run -r lint && pnpm run build 
+pnpm run -r lint && pnpm run build
 
 # Build WooCommerce Core and all of its dependencies
-pnpm run --filter='woocommerce' build 
+pnpm run --filter='woocommerce' build
 
 # Lint the @woocommerce/components package - note the different argument order, turbo scripts
 # are not running lints at this point in time.
-pnpm run -r --filter='@woocommerce/components' lint 
+pnpm run -r --filter='@woocommerce/components' lint
 
 # Test all of the @woocommerce scoped packages
-pnpm run --filter='@woocommerce/*' test 
+pnpm run --filter='@woocommerce/*' test
 
 # Build all of the JavaScript packages
-pnpm run --filter='./packages/js/*' build 
+pnpm run --filter='./packages/js/*' build
 
 # Build everything except WooCommerce Core
-pnpm run --filter='!woocommerce' build 
+pnpm run --filter='!woocommerce' build
 
 # Build everything that has changed since the last commit
-pnpm run --filter='[HEAD^1]' build 
+pnpm run --filter='[HEAD^1]' build
 ```
 
 ### Cache busting Turbo
@@ -90,3 +90,25 @@ pnpm -- wp-env destroy
 Each of the [plugins in our repository](plugins) support using this tool to spin up a development environment. Note that rather than having a single top-level environment, each plugin has its own. This is done in order to prevent conflicts between them.
 
 Please check out [the official documentation](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-env/) if you would like to learn more about this tool.
+
+## Troubleshooting
+
+### Installing PHP in Unix (e.g. Ubuntu)
+
+Many unix systems such as Ubuntu will have PHP already installed. Sometimes without the extra packages you need to run WordPress and this will cause you to run into troubles.
+
+Use your package manager to add the extra PHP packages you'll need.
+e.g. in Ubuntu you can run:
+
+```
+sudo apt update
+sudo apt install php-bcmath \
+                 php-curl \
+                 php-imagick \
+                 php-intl \
+                 php-json \
+                 php-mbstring \
+                 php-mysql \
+                 php-xml \
+                 php-zip
+```
diff --git a/README.md b/README.md
index 3c4ba63c3ac..56778877724 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ To get up and running within the WooCommerce Monorepo, you will need to make sur
 
 -   [NVM](https://github.com/nvm-sh/nvm#installing-and-updating): While you can always install Node through other means, we recommend using NVM to ensure you're aligned with the version used by our development teams. Our repository contains [an `.nvmrc` file](.nvmrc) which helps ensure you are using the correct version of Node.
 -   [PNPM](https://pnpm.io/installation): Our repository utilizes PNPM to manage project dependencies and run various scripts involved in building and testing projects.
--   [PHP 7.2+](https://www.php.net/manual/en/install.php): WooCommerce Core currently features a minimum PHP version of 7.2. It is also needed to run Composer and various project build scripts.
+-   [PHP 7.2+](https://www.php.net/manual/en/install.php): WooCommerce Core currently features a minimum PHP version of 7.2. It is also needed to run Composer and various project build scripts. See [troubleshooting](DEVELOPMENT.md#troubleshooting) for troubleshooting problems installing PHP.
 -   [Composer](https://getcomposer.org/doc/00-intro.md): We use Composer to manage all of the dependencies for PHP packages and plugins.
 
 Once you've installed all of the prerequisites, you can run the following commands to get everything working.
diff --git a/changelog.txt b/changelog.txt
index 6005a873509..3d8ebf87944 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,131 @@
 == Changelog ==
 
+= 7.7.0 2023-05-10 =
+
+**WooCommerce**
+
+* Fix - Removing auto-draft as wc post type to resolve publish time bug. [#38099](https://github.com/woocommerce/woocommerce/pull/38099)
+* Fix - Handle updating customer when user_registered is 0000-00-00 00:00:00. [#37907](https://github.com/woocommerce/woocommerce/pull/37907)
+* Fix - Sync up date_column_name default for orders table, between stats and table data. [#37927](https://github.com/woocommerce/woocommerce/pull/37927)
+* Fix - Fix regression in supporting nested date query arguments in HPOS. [#37827](https://github.com/woocommerce/woocommerce/pull/37827)
+* Fix - Fix disabled "Save attributes" button [#37790](https://github.com/woocommerce/woocommerce/pull/37790)
+* Fix - Accessibility update for product_categories shortcode. [#37445](https://github.com/woocommerce/woocommerce/pull/37445)
+* Fix - Add sort order to  migration script for consistency. [#37545](https://github.com/woocommerce/woocommerce/pull/37545)
+* Fix - Add support for end_at ID to allow partial verification. [#37446](https://github.com/woocommerce/woocommerce/pull/37446)
+* Fix - Avoid over-aggressive escaping of the payment gateway title in the context of the checkout thank you page. [#37481](https://github.com/woocommerce/woocommerce/pull/37481)
+* Fix - Corrects imported ContainerInterface. It was not replaced because of the leading backslash. [#37334](https://github.com/woocommerce/woocommerce/pull/37334)
+* Fix - Delete shipping zone count transient on woocommerce_shipping_zone_method_added and woocommerce_after_shipping_zone_object_save [#37693](https://github.com/woocommerce/woocommerce/pull/37693)
+* Fix - Delete tax lookup and order stats database records when an order is deleted while orders table is authoritative [#36601](https://github.com/woocommerce/woocommerce/pull/36601)
+* Fix - fixed bug where adjust_download_permissions was being scheduled on variable products without downloadable variations [#34828](https://github.com/woocommerce/woocommerce/pull/34828)
+* Fix - Fixed the attributes table styling in TT2 tabs content area [#37639](https://github.com/woocommerce/woocommerce/pull/37639)
+* Fix - Fix ellipsis menu overlaps on small screen [#37583](https://github.com/woocommerce/woocommerce/pull/37583)
+* Fix - Fixes a failing e2e test for product variations [#37246](https://github.com/woocommerce/woocommerce/pull/37246)
+* Fix - Fix global button aria-disabled style [#37461](https://github.com/woocommerce/woocommerce/pull/37461)
+* Fix - Fix incorrect variable name in api-core-tests [#37388](https://github.com/woocommerce/woocommerce/pull/37388)
+* Fix - Fix missing result prop in wcadmin_install_plugin_error track [#37466](https://github.com/woocommerce/woocommerce/pull/37466)
+* Fix - Fix special characters not rendered in admin titles [#37546](https://github.com/woocommerce/woocommerce/pull/37546)
+* Fix - Fix table alias issue in order field queries. [#37560](https://github.com/woocommerce/woocommerce/pull/37560)
+* Fix - Fix the type for order items in the schema definition of REST API v1 and V2 [#35940](https://github.com/woocommerce/woocommerce/pull/35940)
+* Fix - Lock the product block editor template root [#37685](https://github.com/woocommerce/woocommerce/pull/37685)
+* Fix - Make migration more strict by removing IGNORE [#37595](https://github.com/woocommerce/woocommerce/pull/37595)
+* Fix - Minor fixup for getting order ids in verify db command. [#37576](https://github.com/woocommerce/woocommerce/pull/37576)
+* Fix - Refetch data for "Installed extensions" card after installing a recommended marketing channel. [#37300](https://github.com/woocommerce/woocommerce/pull/37300)
+* Fix - Remove double checking for woocommerce_tax_display_cart filter. [#37617](https://github.com/woocommerce/woocommerce/pull/37617)
+* Fix - Remove unique constraint from order_key, since orders can be created with empty order keys, which then conflict with the constraint. [#37594](https://github.com/woocommerce/woocommerce/pull/37594)
+* Fix - Removing modification to rest_namespace on post type and replacing with middleware. [#37621](https://github.com/woocommerce/woocommerce/pull/37621)
+* Fix - Replace information_schema queries in favor of create table parsing to remove foreign key constraints during updates [#37299](https://github.com/woocommerce/woocommerce/pull/37299)
+* Fix - Restores comments (reviews) to the product editor. [#37457](https://github.com/woocommerce/woocommerce/pull/37457)
+* Fix - Revert changes to use window.fetch in legacy cart JS [#37463](https://github.com/woocommerce/woocommerce/pull/37463)
+* Fix - Synchronized SSR from template to REST API. [#37425](https://github.com/woocommerce/woocommerce/pull/37425)
+* Fix - Updates an e2e variable name to be more descriptive [#37448](https://github.com/woocommerce/woocommerce/pull/37448)
+* Fix - update select all to checkbox in menu editor [#37562](https://github.com/woocommerce/woocommerce/pull/37562)
+* Fix - Use first meta value for HPOS migration when there are duplicates for flat column. [#37676](https://github.com/woocommerce/woocommerce/pull/37676)
+* Fix - Hide stock status field if stock management is enabled. [#37890](https://github.com/woocommerce/woocommerce/pull/37890)
+* Add - Add plugin installer version independent of WP cron. [#37753](https://github.com/woocommerce/woocommerce/pull/37753)
+* Add - Add a category for product editor blocks [#37347](https://github.com/woocommerce/woocommerce/pull/37347)
+* Add - Add country query param to payment gateway data sources [#37443](https://github.com/woocommerce/woocommerce/pull/37443)
+* Add - Add image configuration to the product block template [#37340](https://github.com/woocommerce/woocommerce/pull/37340)
+* Add - Add images block to product editor template [#37455](https://github.com/woocommerce/woocommerce/pull/37455)
+* Add - add import webp support [#37307](https://github.com/woocommerce/woocommerce/pull/37307)
+* Add - Adding charge sales tax field to product block editor template. [#37582](https://github.com/woocommerce/woocommerce/pull/37582)
+* Add - Adding checkbox, conditional and inventory email blocks to product blocks editor. [#37646](https://github.com/woocommerce/woocommerce/pull/37646)
+* Add - Adding inventory section and sku blocks to product block editor. [#37623](https://github.com/woocommerce/woocommerce/pull/37623)
+* Add - Add method delete_meta_data_value to WC_Data objects [#37667](https://github.com/woocommerce/woocommerce/pull/37667)
+* Add - Add methods to OrderUtil to get the names of order database tables [#37624](https://github.com/woocommerce/woocommerce/pull/37624)
+* Add - Add pricing section to the pricing tab [#37513](https://github.com/woocommerce/woocommerce/pull/37513)
+* Add - Add product editor blocks to assets build folder [#37318](https://github.com/woocommerce/woocommerce/pull/37318)
+* Add - Add product schedule sale pricing block to blocks template definition [#37567](https://github.com/woocommerce/woocommerce/pull/37567)
+* Add - Add product shipping fee block to blocks template definition [#37642](https://github.com/woocommerce/woocommerce/pull/37642)
+* Add - Add summary block [#37302](https://github.com/woocommerce/woocommerce/pull/37302)
+* Add - Add tax class to product editor template [#37529](https://github.com/woocommerce/woocommerce/pull/37529)
+* Add - Add tracks events to attributes tab [#37622](https://github.com/woocommerce/woocommerce/pull/37622)
+* Add - Add tracks events to variations tab [#37607](https://github.com/woocommerce/woocommerce/pull/37607)
+* Add - Add Woo Payments feature slotfill on homepage [#37768](https://github.com/woocommerce/woocommerce/pull/37768)
+* Add - Allows the WP, WC & PHP version to be specified in .wp-env.json for e2e and api tests [#37587](https://github.com/woocommerce/woocommerce/pull/37587)
+* Add - Change variations dropdown menu visibility [#37558](https://github.com/woocommerce/woocommerce/pull/37558)
+* Add - Register product track inventory block [#37585](https://github.com/woocommerce/woocommerce/pull/37585)
+* Add - Register woocommerce/product-shipping-dimensions-fields block [#37683](https://github.com/woocommerce/woocommerce/pull/37683)
+* Update - Update WooCommerce Blocks to 10.0.2 [#37818](https://github.com/woocommerce/woocommerce/pull/37818)
+* Update - Update WC Blocks to include changes from 9.9.0, 10.0.0 and 10.0.1 [#37662](https://github.com/woocommerce/woocommerce/pull/37662)
+* Update - Add default priority for countries that are not in the payment recommendation map [#37590](https://github.com/woocommerce/woocommerce/pull/37590)
+* Update - Add Payoneer, zipco payment gateways and update Klarna available countries [#37329](https://github.com/woocommerce/woocommerce/pull/37329)
+* Update - Filter out marketing channels in "Installed extensions" and "Discover more marketing tools" cards. [#37126](https://github.com/woocommerce/woocommerce/pull/37126)
+* Update - FlexSlider always uses Web Animations API for "slide" animations. [#36987](https://github.com/woocommerce/woocommerce/pull/36987)
+* Update - Make Multichannel Marketing the default new UI for Marketing page; remove classic Marketing page and unused code. [#37430](https://github.com/woocommerce/woocommerce/pull/37430)
+* Update - Migrate steps location task to TS [#37257](https://github.com/woocommerce/woocommerce/pull/37257)
+* Update - Refactoring product editor more menu items, and using in block editor slot fills. [#37255](https://github.com/woocommerce/woocommerce/pull/37255)
+* Update - Register product editor blocks server-side [#37339](https://github.com/woocommerce/woocommerce/pull/37339)
+* Update - Remove multichannel marketing info from WC Tracker [#37438](https://github.com/woocommerce/woocommerce/pull/37438)
+* Update - Remove theme step from onboarding wizard [#37671](https://github.com/woocommerce/woocommerce/pull/37671)
+* Update - Replacing multiple components on the block product page with a single hook. [#37283](https://github.com/woocommerce/woocommerce/pull/37283)
+* Update - Show different error message when deleting an attribute used in variations [#37527](https://github.com/woocommerce/woocommerce/pull/37527)
+* Update - Show tooltip in Save attributes button instead of using title attribute [#37345](https://github.com/woocommerce/woocommerce/pull/37345)
+* Update - Support min_php_version and min_wp_version for the free extensions feed [#37694](https://github.com/woocommerce/woocommerce/pull/37694)
+* Update - Update payment gateway recommendation priority [#37442](https://github.com/woocommerce/woocommerce/pull/37442)
+* Update - Update textdomain in woocommerce-blocks *.json files to `woocommerce` [#37234](https://github.com/woocommerce/woocommerce/pull/37234)
+* Dev - Fix recent failures in "Smoke test release" workflow. [#37783](https://github.com/woocommerce/woocommerce/pull/37783)
+* Dev - Add composer scripts for linting with phpcs-changed [#37465](https://github.com/woocommerce/woocommerce/pull/37465)
+* Dev - Add tracks event to gather onboarding heuristics [#37767](https://github.com/woocommerce/woocommerce/pull/37767)
+* Dev - Bump required PHP version to 7.3 and PHPUnit version to 9 [#37366](https://github.com/woocommerce/woocommerce/pull/37366)
+* Dev - Code refactor on marketing components. [#37444](https://github.com/woocommerce/woocommerce/pull/37444)
+* Dev - Dev - Add customer object parameter to taxable address filter [#37426](https://github.com/woocommerce/woocommerce/pull/37426)
+* Dev - Dev - Allow to filter wc_help_tip [#37485](https://github.com/woocommerce/woocommerce/pull/37485)
+* Dev - Fix WP latest-2 version retrieval in the "Smoke test release" workflow. [#37675](https://github.com/woocommerce/woocommerce/pull/37675)
+* Dev - Item controls for attribute creation are always visible [#37620](https://github.com/woocommerce/woocommerce/pull/37620)
+* Dev - Migrate woocommerce-payments task to TS and remove connect.js from task fills [#37308](https://github.com/woocommerce/woocommerce/pull/37308)
+* Dev - Move additional CES-related components to @woocommerce/customer-effort-score. [#37316](https://github.com/woocommerce/woocommerce/pull/37316)
+* Dev - Move components to @woocommerce/product-editor [#37131](https://github.com/woocommerce/woocommerce/pull/37131)
+* Dev - New empty state for variations - no variations have been created yet [#37411](https://github.com/woocommerce/woocommerce/pull/37411)
+* Dev - Reduce flakiness on E2E test setup. [#37410](https://github.com/woocommerce/woocommerce/pull/37410)
+* Dev - Rename the default placeholder in the new attribute form header to New attribute [#37645](https://github.com/woocommerce/woocommerce/pull/37645)
+* Dev - Replaced `example.org` in tests with WP_TESTS_DOMAIN for consistency with WordPress Core. [#37742](https://github.com/woocommerce/woocommerce/pull/37742)
+* Dev - Reset variable product tour after running e2e tests. [#37680](https://github.com/woocommerce/woocommerce/pull/37680)
+* Dev - Run E2E tests on PR merge to trunk. [#37033](https://github.com/woocommerce/woocommerce/pull/37033)
+* Dev - Set quantity value when stock tracking is enabled [#37304](https://github.com/woocommerce/woocommerce/pull/37304)
+* Dev - Simplify boolean expression before && in Marketing page. [#37452](https://github.com/woocommerce/woocommerce/pull/37452)
+* Dev - Smoke test WooCommerce with plugins installed on releases. [#37361](https://github.com/woocommerce/woocommerce/pull/37361)
+* Dev - Split can create product, attributes and variations, edit variations and delete variations into smaller tests to avoid timing out [#37733](https://github.com/woocommerce/woocommerce/pull/37733)
+* Dev - Update webpack config to use @woocommerce/internal-style-build's parser config [#37195](https://github.com/woocommerce/woocommerce/pull/37195)
+* Tweak - Update plugin listing description [#38074](https://github.com/woocommerce/woocommerce/pull/38074)
+* Tweak - Changed label for button to add a new global attribute value from the product screen. [#37414](https://github.com/woocommerce/woocommerce/pull/37414)
+* Tweak - Default to sorting orders by date (desc) when HPOS is active. [#37565](https://github.com/woocommerce/woocommerce/pull/37565)
+* Tweak - Exclude empty attributes from the attribute count when tracking product updates. [#37718](https://github.com/woocommerce/woocommerce/pull/37718)
+* Tweak - Fix typo in a function comment. [#37746](https://github.com/woocommerce/woocommerce/pull/37746)
+* Tweak - Fix typo in Stats controller [#37407](https://github.com/woocommerce/woocommerce/pull/37407)
+* Tweak - Fix typos in comments in REST API customers controller [#37405](https://github.com/woocommerce/woocommerce/pull/37405)
+* Tweak - Remove the multichannel marketing feature flag from database since it's the default option now. [#37454](https://github.com/woocommerce/woocommerce/pull/37454)
+* Tweak - Remove timeouts in e2e tests for variable products and analytics. [#37335](https://github.com/woocommerce/woocommerce/pull/37335)
+* Tweak - Update mobile app image resolution [#37506](https://github.com/woocommerce/woocommerce/pull/37506)
+* Tweak - Update style of product attributes tab empty state. [#37429](https://github.com/woocommerce/woocommerce/pull/37429)
+* Tweak - Update to the merchant variable product e2e test [#37714](https://github.com/woocommerce/woocommerce/pull/37714)
+* Performance - Improve search count query performance by avoiding LEFT JOIN in favor of subquery. [#36688](https://github.com/woocommerce/woocommerce/pull/36688)
+* Enhancement - Added a button to download SSR to a file. [#38110](https://github.com/woocommerce/woocommerce/pull/38110)
+* Enhancement - Added a woocommerce_disable_api_access_log filter to disable last access logging for rest api. [#37332](https://github.com/woocommerce/woocommerce/pull/37332)
+* Enhancement - Fix rounding difference on refunds with per-line taxes [#34641](https://github.com/woocommerce/woocommerce/pull/34641)
+* Enhancement - Show info message when on variations tab and no attributes have been assigned to product. [#37352](https://github.com/woocommerce/woocommerce/pull/37352)
+* Enhancement - Show tour when product type is changed to variable. [#37413](https://github.com/woocommerce/woocommerce/pull/37413)
+
+
 = 7.6.1 2023-04-26 =
 
 **WooCommerce**
@@ -54,7 +180,7 @@
 * Fix - Prevent possible warning arising from use of woocommerce_wp_* family of functions. [#37026](https://github.com/woocommerce/woocommerce/pull/37026)
 * Fix - Record values for toggled checkboxes/features in settings [#37242](https://github.com/woocommerce/woocommerce/pull/37242)
 * Fix - Restore the sort order when orders are cached. [#36650](https://github.com/woocommerce/woocommerce/pull/36650)
-* Fix - Treat order as seperate resource when validating for webhook since it's not necessarily a CPT anymore. [#36650](https://github.com/woocommerce/woocommerce/pull/36650)
+* Fix - Treat order as separate resource when validating for webhook since it's not necessarily a CPT anymore. [#36650](https://github.com/woocommerce/woocommerce/pull/36650)
 * Fix - Update Customers report with latest user data after editing user. [#37237](https://github.com/woocommerce/woocommerce/pull/37237)
 * Add - Add "Create a new campaign" modal in Campaigns card in Multichannel Marketing page. [#37044](https://github.com/woocommerce/woocommerce/pull/37044)
 * Add - Add a cache for orders, to use when custom order tables are enabled [#35014](https://github.com/woocommerce/woocommerce/pull/35014)
@@ -432,7 +558,7 @@
 * Tweak - Resolve an error in the product tracking code by testing to see if the `post_type` query var is set before checking its value. [#34501](https://github.com/woocommerce/woocommerce/pull/34501)
 * Tweak - Simplify wording within the customer emails for on-hold orders. [#31886](https://github.com/woocommerce/woocommerce/pull/31886)
 * Tweak - WooCommerce has now been tested up to WordPress 6.1.x. [#35985](https://github.com/woocommerce/woocommerce/pull/35985)
-* Performance - Split CALC_FOUND_ROW query into seperate count query for better performance. [#35468](https://github.com/woocommerce/woocommerce/pull/35468)
+* Performance - Split CALC_FOUND_ROW query into separate count query for better performance. [#35468](https://github.com/woocommerce/woocommerce/pull/35468)
 * Enhancement - Add a bottom padding to the whole form [#35721](https://github.com/woocommerce/woocommerce/pull/35721)
 * Enhancement - Add a confirmation modal when the user tries to navigate away with unsaved changes [#35625](https://github.com/woocommerce/woocommerce/pull/35625)
 * Enhancement - Add a default placeholder title for newly added attributes and always show remove button for attributes [#35904](https://github.com/woocommerce/woocommerce/pull/35904)
@@ -3371,7 +3497,7 @@
 * Fix - Add protection around func_get_args_call for backwards compatibility. #28677
 * Fix - Restore stock_status in REST API V3 response. #28731
 * Fix - Revert some of the changes related to perf enhancements (27735) as it was breaking stock_status filter. #28745
-* Dev - Hook for intializing price slider in frontend. #28014
+* Dev - Hook for initializing price slider in frontend. #28014
 * Dev - Add support for running a custom initialization script for tests. #28041
 * Dev - Use the coenjacobs/mozart package to renamespace vendor packages. #28147
 * Dev - Documentation for `wc_get_container`. #28269
@@ -5290,7 +5416,7 @@
 * Fix - Fix edge case where `get_plugins` would not have the custom WooCommerce plugin headers if `get_plugins` was called early. #21669
 * Fix - Prevent PHP warning when deprecated user meta starts with uppercase. #21943
 * Fix - Fixed support for multiple query parameters translated to meta queries via REST API requests. #22108
-* Fix - Prevent PHP errors when trying to access non-existant report tabs. #22183
+* Fix - Prevent PHP errors when trying to access non-existent report tabs. #22183
 * Fix - Filter by attributes dropdown placeholder text should not be wrapped in quotes. #22185
 * Fix - Apply sale price until end of closing sale date. #22189
 * Fix - Allow empty schema again when registering a custom field for the API. #22204
@@ -6612,7 +6738,7 @@
 * Removed internal scroll from log viewer.
 * Add reply-to to admin emails.
 * Improved the zone setup flow.
-* Made wc_get_wildcard_postcodes return the orignal postcode plus * since wildcards should match empty strings too.
+* Made wc_get_wildcard_postcodes return the original postcode plus * since wildcards should match empty strings too.
 * Use all paid statuses in $customer->get_total_spent().
 * Move location of billing email field to work with password managers.
 * Option to restrict selling locations by country.
@@ -8122,7 +8248,7 @@
 * Tweak - Flat rate shipping support for percentage factor of additional costs.
 * Tweak - local delivery _ pattern matching for postcodes. e.g. NG1___ would match NG1 1AA but not NG10 1AA.
 * Tweak - Improved layered nav OR count logic
-* Tweak - Make shipping methods check if taxable, so when customer is VAT excempt taxes are not included in price.
+* Tweak - Make shipping methods check if taxable, so when customer is VAT exempt taxes are not included in price.
 * Tweak - Coupon in admin bar new menu #3974
 * Tweak - Shortcode tag filters + updated menu names to make white labelling easier.
 * Tweak - Removed placeholder polyfill. Use this plugin to replace functionality if required: https://wordpress.org/plugins/html5-placeholder-polyfill/
diff --git a/package.json b/package.json
index 9c8ac22039e..dc0cc55d9b0 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
 		"create-extension": "node ./tools/create-extension/index.js",
 		"cherry-pick": "node ./tools/cherry-pick/bin/run",
 		"sync-dependencies": "pnpm exec syncpack -- fix-mismatches",
-		"utils": "./tools/monorepo-utils/bin/run"
+		"utils": "node ./tools/monorepo-utils/dist/index.js"
 	},
 	"devDependencies": {
 		"@babel/preset-env": "^7.20.2",
diff --git a/packages/js/components/changelog/add-38248 b/packages/js/components/changelog/add-38248
new file mode 100644
index 00000000000..76d51203088
--- /dev/null
+++ b/packages/js/components/changelog/add-38248
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Make DateTimePickerControl a ForwardedRef component"
diff --git a/packages/js/components/changelog/add-core-profiler-user-profile b/packages/js/components/changelog/add-core-profiler-user-profile
new file mode 100644
index 00000000000..ab57ba63f55
--- /dev/null
+++ b/packages/js/components/changelog/add-core-profiler-user-profile
@@ -0,0 +1,4 @@
+Significance: patch
+Type: add
+
+Add onKeyDown and readOnlyWhenClosed options to experimentalSelectControl
diff --git a/packages/js/components/changelog/add-selecttree-singlemode b/packages/js/components/changelog/add-selecttree-singlemode
new file mode 100644
index 00000000000..a35c19a4a83
--- /dev/null
+++ b/packages/js/components/changelog/add-selecttree-singlemode
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add single selection mode to SelectTree
diff --git a/packages/js/components/changelog/dev-migrate-select-control-to-ts b/packages/js/components/changelog/dev-migrate-select-control-to-ts
new file mode 100644
index 00000000000..475884bfaa6
--- /dev/null
+++ b/packages/js/components/changelog/dev-migrate-select-control-to-ts
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Migrate select control component to TS
diff --git a/packages/js/components/changelog/fix-37502 b/packages/js/components/changelog/fix-37502
new file mode 100644
index 00000000000..115429c4b01
--- /dev/null
+++ b/packages/js/components/changelog/fix-37502
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Correct spelling errors
diff --git a/packages/js/components/changelog/fix-38210 b/packages/js/components/changelog/fix-38210
new file mode 100644
index 00000000000..26520bd3a91
--- /dev/null
+++ b/packages/js/components/changelog/fix-38210
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Wrap selected items in experimental select control
diff --git a/packages/js/components/changelog/improve-selecttree-label b/packages/js/components/changelog/improve-selecttree-label
new file mode 100644
index 00000000000..5a831787bf3
--- /dev/null
+++ b/packages/js/components/changelog/improve-selecttree-label
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Use BaseControl in the SelectTree label
diff --git a/packages/js/components/changelog/update-37727 b/packages/js/components/changelog/update-37727
new file mode 100644
index 00000000000..9b6f5259944
--- /dev/null
+++ b/packages/js/components/changelog/update-37727
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Show comma separated list in ready only mode of select tree control
diff --git a/packages/js/components/changelog/update-37955_disable_drag_and_drop_images_block b/packages/js/components/changelog/update-37955_disable_drag_and_drop_images_block
new file mode 100644
index 00000000000..436e516160c
--- /dev/null
+++ b/packages/js/components/changelog/update-37955_disable_drag_and_drop_images_block
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add allowDragging option to ImageGallery to support disabling drag and drop of images.
diff --git a/packages/js/components/changelog/update-tree-item b/packages/js/components/changelog/update-tree-item
new file mode 100644
index 00000000000..9473f708688
--- /dev/null
+++ b/packages/js/components/changelog/update-tree-item
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+TreeControl: Fix a bug where items with children were not selected in single mode and fix a bug where navigation between items with tab was not working properly.
diff --git a/packages/js/components/src/chart/README.md b/packages/js/components/src/chart/README.md
index 28082ca574a..a8a4474a6cb 100644
--- a/packages/js/components/src/chart/README.md
+++ b/packages/js/components/src/chart/README.md
@@ -94,7 +94,7 @@ Name | Type | Default | Description
 `legendPosition` | One of: 'bottom', 'side', 'top', 'hidden' | `null` | Position the legend must be displayed in. If it's not defined, it's calculated depending on the viewport width and the mode
 `legendTotals` | Object | `null` | Values to overwrite the legend totals. If not defined, the sum of all line values will be used
 `screenReaderFormat` | One of type: string, func | `'%B %-d, %Y'` | A datetime formatting string or overriding function to format the screen reader labels
-`showHeaderControls` | Boolean | `true` | Wether header UI controls must be displayed
+`showHeaderControls` | Boolean | `true` | Whether header UI controls must be displayed
 `title` | String | `null` | A title describing this chart
 `tooltipLabelFormat` | One of type: string, func | `'%B %-d, %Y'` | A datetime formatting string or overriding function to format the tooltip label
 `tooltipValueFormat` | One of type: string, func | `','` | A number formatting string or function to format the value displayed in the tooltips
diff --git a/packages/js/components/src/chart/index.js b/packages/js/components/src/chart/index.js
index c5afe925f08..101753f08bd 100644
--- a/packages/js/components/src/chart/index.js
+++ b/packages/js/components/src/chart/index.js
@@ -577,7 +577,7 @@ Chart.propTypes = {
 		PropTypes.func,
 	] ),
 	/**
-	 * Wether header UI controls must be displayed.
+	 * Whether header UI controls must be displayed.
 	 */
 	showHeaderControls: PropTypes.bool,
 	/**
diff --git a/packages/js/components/src/date-time-picker-control/date-time-picker-control.tsx b/packages/js/components/src/date-time-picker-control/date-time-picker-control.tsx
index 0f7d8eee0fd..edeee89611f 100644
--- a/packages/js/components/src/date-time-picker-control/date-time-picker-control.tsx
+++ b/packages/js/components/src/date-time-picker-control/date-time-picker-control.tsx
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { Ref } from 'react';
 import { format as formatDate } from '@wordpress/date';
 import {
 	createElement,
@@ -9,6 +10,7 @@ import {
 	useEffect,
 	useMemo,
 	useRef,
+	forwardRef,
 } from '@wordpress/element';
 import { Icon, calendar } from '@wordpress/icons';
 import moment, { Moment } from 'moment';
@@ -48,306 +50,329 @@ export type DateTimePickerControlProps = {
 	placeholder?: string;
 	help?: string | null;
 	onChangeDebounceWait?: number;
-} & Omit< React.HTMLAttributes< HTMLDivElement >, 'onChange' >;
+} & Omit< React.HTMLAttributes< HTMLInputElement >, 'onChange' >;
 
-export const DateTimePickerControl: React.FC< DateTimePickerControlProps > = ( {
-	currentDate,
-	isDateOnlyPicker = false,
-	is12HourPicker = true,
-	timeForDateOnly = 'start-of-day',
-	dateTimeFormat,
-	disabled = false,
-	onChange,
-	onBlur,
-	label,
-	placeholder,
-	help,
-	className = '',
-	onChangeDebounceWait = 500,
-}: DateTimePickerControlProps ) => {
-	const instanceId = useInstanceId( DateTimePickerControl );
-	const id = `inspector-date-time-picker-control-${ instanceId }`;
-	const inputControl = useRef< InputControl >();
+export const DateTimePickerControl = forwardRef(
+	function ForwardedDateTimePickerControl(
+		{
+			currentDate,
+			isDateOnlyPicker = false,
+			is12HourPicker = true,
+			timeForDateOnly = 'start-of-day',
+			dateTimeFormat,
+			disabled = false,
+			onChange,
+			onBlur,
+			label,
+			placeholder,
+			help,
+			className = '',
+			onChangeDebounceWait = 500,
+			...props
+		}: DateTimePickerControlProps,
+		ref: Ref< HTMLInputElement >
+	) {
+		const id = useInstanceId(
+			DateTimePickerControl,
+			'inspector-date-time-picker-control',
+			props.id
+		) as string;
+		const inputControl = useRef< InputControl >();
 
-	const displayFormat = useMemo( () => {
-		if ( dateTimeFormat ) {
-			return dateTimeFormat;
-		}
-
-		if ( isDateOnlyPicker ) {
-			return defaultDateFormat;
-		}
-
-		if ( is12HourPicker ) {
-			return default12HourDateTimeFormat;
-		}
-
-		return default24HourDateTimeFormat;
-	}, [ dateTimeFormat, isDateOnlyPicker, is12HourPicker ] );
-
-	function parseAsISODateTime(
-		dateString?: string | null,
-		assumeLocalTime = false
-	): Moment {
-		return assumeLocalTime
-			? moment( dateString, moment.ISO_8601, true ).utc()
-			: moment.utc( dateString, moment.ISO_8601, true );
-	}
-
-	function parseAsLocalDateTime( dateString: string | null ): Moment {
-		// parse input date string as local time;
-		// be lenient of user input and try to match any format Moment can
-		return moment( dateString );
-	}
-
-	const maybeForceTime = useCallback(
-		( momentDate: Moment ) => {
-			if ( ! isDateOnlyPicker || ! momentDate.isValid() )
-				return momentDate;
-
-			// We want to set to the start/end of the local time, so
-			// we need to put our Moment instance into "local" mode
-			const updatedMomentDate = momentDate.clone().local();
-
-			if ( timeForDateOnly === 'start-of-day' ) {
-				updatedMomentDate.startOf( 'day' );
-			} else if ( timeForDateOnly === 'end-of-day' ) {
-				updatedMomentDate.endOf( 'day' );
+		const displayFormat = useMemo( () => {
+			if ( dateTimeFormat ) {
+				return dateTimeFormat;
 			}
 
-			return updatedMomentDate;
-		},
-		[ isDateOnlyPicker, timeForDateOnly ]
-	);
+			if ( isDateOnlyPicker ) {
+				return defaultDateFormat;
+			}
 
-	function hasFocusLeftInputAndDropdownContent(
-		event: React.FocusEvent< HTMLInputElement >
-	): boolean {
-		return ! event.relatedTarget?.closest(
-			'.components-dropdown__content'
+			if ( is12HourPicker ) {
+				return default12HourDateTimeFormat;
+			}
+
+			return default24HourDateTimeFormat;
+		}, [ dateTimeFormat, isDateOnlyPicker, is12HourPicker ] );
+
+		function parseAsISODateTime(
+			dateString?: string | null,
+			assumeLocalTime = false
+		): Moment {
+			return assumeLocalTime
+				? moment( dateString, moment.ISO_8601, true ).utc()
+				: moment.utc( dateString, moment.ISO_8601, true );
+		}
+
+		function parseAsLocalDateTime( dateString: string | null ): Moment {
+			// parse input date string as local time;
+			// be lenient of user input and try to match any format Moment can
+			return moment( dateString );
+		}
+
+		const maybeForceTime = useCallback(
+			( momentDate: Moment ) => {
+				if ( ! isDateOnlyPicker || ! momentDate.isValid() )
+					return momentDate;
+
+				// We want to set to the start/end of the local time, so
+				// we need to put our Moment instance into "local" mode
+				const updatedMomentDate = momentDate.clone().local();
+
+				if ( timeForDateOnly === 'start-of-day' ) {
+					updatedMomentDate.startOf( 'day' );
+				} else if ( timeForDateOnly === 'end-of-day' ) {
+					updatedMomentDate.endOf( 'day' );
+				}
+
+				return updatedMomentDate;
+			},
+			[ isDateOnlyPicker, timeForDateOnly ]
+		);
+
+		function hasFocusLeftInputAndDropdownContent(
+			event: React.FocusEvent< HTMLInputElement >
+		): boolean {
+			return ! event.relatedTarget?.closest(
+				'.components-dropdown__content'
+			);
+		}
+
+		const formatDateTimeForDisplay = useCallback(
+			( dateTime: Moment ) => {
+				return dateTime.isValid()
+					? // @ts-expect-error TODO - fix this type error with moment
+					  formatDate( displayFormat, dateTime.local() )
+					: dateTime.creationData().input?.toString() || '';
+			},
+			[ displayFormat ]
+		);
+
+		function formatDateTimeAsISO( dateTime: Moment ): string {
+			return dateTime.isValid()
+				? dateTime.utc().toISOString()
+				: dateTime.creationData().input?.toString() || '';
+		}
+
+		const currentDateTime = parseAsISODateTime( currentDate );
+
+		const [ inputString, setInputString ] = useState(
+			currentDateTime.isValid()
+				? formatDateTimeForDisplay( maybeForceTime( currentDateTime ) )
+				: ''
+		);
+
+		const inputStringDateTime = useMemo( () => {
+			return maybeForceTime( parseAsLocalDateTime( inputString ) );
+		}, [ inputString, maybeForceTime ] );
+
+		// We keep a ref to the onChange prop so that we can be sure we are
+		// always using the more up-to-date value, even if it changes
+		// it while a debounced onChange handler is in progress
+		const onChangeRef = useRef<
+			DateTimePickerControlOnChangeHandler | undefined
+		>();
+		useEffect( () => {
+			onChangeRef.current = onChange;
+		}, [ onChange ] );
+
+		const setInputStringAndMaybeCallOnChange = useCallback(
+			( newInputString: string, isUserTypedInput: boolean ) => {
+				// InputControl doesn't fire an onChange if what the user has typed
+				// matches the current value of the input field. To get around this,
+				// we pull the value directly out of the input field. This fixes
+				// the issue where the user ends up typing the same value. Unless they
+				// are typing extra slow. Without this workaround, we miss the last
+				// character typed.
+				const lastTypedValue = inputControl.current.value;
+
+				const newDateTime = maybeForceTime(
+					isUserTypedInput
+						? parseAsLocalDateTime( lastTypedValue )
+						: parseAsISODateTime( newInputString, true )
+				);
+				const isDateTimeSame =
+					newDateTime.isSame( inputStringDateTime );
+
+				if ( isUserTypedInput ) {
+					setInputString( lastTypedValue );
+				} else if ( ! isDateTimeSame ) {
+					setInputString( formatDateTimeForDisplay( newDateTime ) );
+				}
+
+				if (
+					typeof onChangeRef.current === 'function' &&
+					! isDateTimeSame
+				) {
+					onChangeRef.current(
+						newDateTime.isValid()
+							? formatDateTimeAsISO( newDateTime )
+							: lastTypedValue,
+						newDateTime.isValid()
+					);
+				}
+			},
+			[ formatDateTimeForDisplay, inputStringDateTime, maybeForceTime ]
+		);
+
+		const debouncedSetInputStringAndMaybeCallOnChange = useDebounce(
+			setInputStringAndMaybeCallOnChange,
+			onChangeDebounceWait
+		);
+
+		function focusInputControl() {
+			if ( inputControl.current ) {
+				inputControl.current.focus();
+			}
+		}
+
+		const getUserInputOrUpdatedCurrentDate = useCallback( () => {
+			if ( currentDate !== undefined ) {
+				const newDateTime = maybeForceTime(
+					parseAsISODateTime( currentDate, false )
+				);
+
+				if ( ! newDateTime.isValid() ) {
+					// keep the invalid string, so the user can correct it
+					return currentDate;
+				}
+
+				if ( ! newDateTime.isSame( inputStringDateTime ) ) {
+					return formatDateTimeForDisplay( newDateTime );
+				}
+
+				// the new currentDate is the same date as the inputString,
+				// so keep exactly what the user typed in
+				return inputString;
+			}
+
+			// the component is uncontrolled (not using currentDate),
+			// so just return the input string
+			return inputString;
+		}, [
+			currentDate,
+			formatDateTimeForDisplay,
+			inputString,
+			maybeForceTime,
+		] );
+
+		// We keep a ref to the onBlur prop so that we can be sure we are
+		// always using the more up-to-date value, otherwise, we get in
+		// any infinite loop when calling onBlur
+		const onBlurRef = useRef< () => void >();
+		useEffect( () => {
+			onBlurRef.current = onBlur;
+		}, [ onBlur ] );
+
+		const callOnBlurIfDropdownIsNotOpening = useCallback( ( willOpen ) => {
+			if ( ! willOpen && typeof onBlurRef.current === 'function' ) {
+				// in case the component is blurred before a debounced
+				// change has been processed, immediately set the input string
+				// to the current value of the input field, so that
+				// it won't be set back to the pre-change value
+				setInputStringAndMaybeCallOnChange(
+					inputControl.current.value,
+					true
+				);
+				onBlurRef.current();
+			}
+		}, [] );
+
+		return (
+			<Dropdown
+				className={ classNames(
+					'woocommerce-date-time-picker-control',
+					className
+				) }
+				position="bottom left"
+				focusOnMount={ false }
+				// @ts-expect-error `onToggle` does exist.
+				onToggle={ callOnBlurIfDropdownIsNotOpening }
+				renderToggle={ ( { isOpen, onClose, onToggle } ) => (
+					<BaseControl id={ id } label={ label } help={ help }>
+						<InputControl
+							{ ...props }
+							id={ id }
+							ref={ ( element: HTMLInputElement ) => {
+								inputControl.current = element;
+								if ( typeof ref === 'function' ) {
+									ref( element );
+								}
+							} }
+							disabled={ disabled }
+							value={ getUserInputOrUpdatedCurrentDate() }
+							onChange={ ( newValue: string ) =>
+								debouncedSetInputStringAndMaybeCallOnChange(
+									newValue,
+									true
+								)
+							}
+							onBlur={ (
+								event: React.FocusEvent< HTMLInputElement >
+							) => {
+								if (
+									hasFocusLeftInputAndDropdownContent( event )
+								) {
+									// close the dropdown, which will also trigger
+									// the component's onBlur to be called
+									onClose();
+								}
+							} }
+							suffix={
+								<Icon
+									icon={ calendar }
+									className="calendar-icon woocommerce-date-time-picker-control__input-control__suffix"
+									onClick={ focusInputControl }
+									size={ 16 }
+								/>
+							}
+							placeholder={ placeholder }
+							describedBy={ sprintf(
+								/* translators: A datetime format */
+								__(
+									'Date input describing a selected date in format %s',
+									'woocommerce'
+								),
+								dateTimeFormat
+							) }
+							onFocus={ () => {
+								if ( isOpen ) {
+									return; // the dropdown is already open, do we don't need to do anything
+								}
+
+								onToggle(); // show the dropdown
+							} }
+							aria-expanded={ isOpen }
+						/>
+					</BaseControl>
+				) }
+				popoverProps={ {
+					className: 'woocommerce-date-time-picker-control__popover',
+				} }
+				renderContent={ () => {
+					const Picker = isDateOnlyPicker
+						? DatePicker
+						: WpDateTimePicker;
+
+					return (
+						<Picker
+							// @ts-expect-error null is valid for currentDate
+							currentDate={
+								inputStringDateTime.isValid()
+									? formatDateTimeAsISO( inputStringDateTime )
+									: null
+							}
+							onChange={ ( newDateTimeISOString: string ) =>
+								setInputStringAndMaybeCallOnChange(
+									newDateTimeISOString,
+									false
+								)
+							}
+							is12Hour={ is12HourPicker }
+						/>
+					);
+				} }
+			/>
 		);
 	}
-
-	const formatDateTimeForDisplay = useCallback(
-		( dateTime: Moment ) => {
-			return dateTime.isValid()
-				? // @ts-expect-error TODO - fix this type error with moment
-				  formatDate( displayFormat, dateTime.local() )
-				: dateTime.creationData().input?.toString() || '';
-		},
-		[ displayFormat ]
-	);
-
-	function formatDateTimeAsISO( dateTime: Moment ): string {
-		return dateTime.isValid()
-			? dateTime.utc().toISOString()
-			: dateTime.creationData().input?.toString() || '';
-	}
-
-	const currentDateTime = parseAsISODateTime( currentDate );
-
-	const [ inputString, setInputString ] = useState(
-		currentDateTime.isValid()
-			? formatDateTimeForDisplay( maybeForceTime( currentDateTime ) )
-			: ''
-	);
-
-	const inputStringDateTime = useMemo( () => {
-		return maybeForceTime( parseAsLocalDateTime( inputString ) );
-	}, [ inputString, maybeForceTime ] );
-
-	// We keep a ref to the onChange prop so that we can be sure we are
-	// always using the more up-to-date value, even if it changes
-	// it while a debounced onChange handler is in progress
-	const onChangeRef = useRef<
-		DateTimePickerControlOnChangeHandler | undefined
-	>();
-	useEffect( () => {
-		onChangeRef.current = onChange;
-	}, [ onChange ] );
-
-	const setInputStringAndMaybeCallOnChange = useCallback(
-		( newInputString: string, isUserTypedInput: boolean ) => {
-			// InputControl doesn't fire an onChange if what the user has typed
-			// matches the current value of the input field. To get around this,
-			// we pull the value directly out of the input field. This fixes
-			// the issue where the user ends up typing the same value. Unless they
-			// are typing extra slow. Without this workaround, we miss the last
-			// character typed.
-			const lastTypedValue = inputControl.current.value;
-
-			const newDateTime = maybeForceTime(
-				isUserTypedInput
-					? parseAsLocalDateTime( lastTypedValue )
-					: parseAsISODateTime( newInputString, true )
-			);
-			const isDateTimeSame = newDateTime.isSame( inputStringDateTime );
-
-			if ( isUserTypedInput ) {
-				setInputString( lastTypedValue );
-			} else if ( ! isDateTimeSame ) {
-				setInputString( formatDateTimeForDisplay( newDateTime ) );
-			}
-
-			if (
-				typeof onChangeRef.current === 'function' &&
-				! isDateTimeSame
-			) {
-				onChangeRef.current(
-					newDateTime.isValid()
-						? formatDateTimeAsISO( newDateTime )
-						: lastTypedValue,
-					newDateTime.isValid()
-				);
-			}
-		},
-		[ formatDateTimeForDisplay, inputStringDateTime, maybeForceTime ]
-	);
-
-	const debouncedSetInputStringAndMaybeCallOnChange = useDebounce(
-		setInputStringAndMaybeCallOnChange,
-		onChangeDebounceWait
-	);
-
-	function focusInputControl() {
-		if ( inputControl.current ) {
-			inputControl.current.focus();
-		}
-	}
-
-	const getUserInputOrUpdatedCurrentDate = useCallback( () => {
-		if ( currentDate !== undefined ) {
-			const newDateTime = maybeForceTime(
-				parseAsISODateTime( currentDate, false )
-			);
-
-			if ( ! newDateTime.isValid() ) {
-				// keep the invalid string, so the user can correct it
-				return currentDate;
-			}
-
-			if ( ! newDateTime.isSame( inputStringDateTime ) ) {
-				return formatDateTimeForDisplay( newDateTime );
-			}
-
-			// the new currentDate is the same date as the inputString,
-			// so keep exactly what the user typed in
-			return inputString;
-		}
-
-		// the component is uncontrolled (not using currentDate),
-		// so just return the input string
-		return inputString;
-	}, [ currentDate, formatDateTimeForDisplay, inputString, maybeForceTime ] );
-
-	// We keep a ref to the onBlur prop so that we can be sure we are
-	// always using the more up-to-date value, otherwise, we get in
-	// any infinite loop when calling onBlur
-	const onBlurRef = useRef< () => void >();
-	useEffect( () => {
-		onBlurRef.current = onBlur;
-	}, [ onBlur ] );
-
-	const callOnBlurIfDropdownIsNotOpening = useCallback( ( willOpen ) => {
-		if ( ! willOpen && typeof onBlurRef.current === 'function' ) {
-			// in case the component is blurred before a debounced
-			// change has been processed, immediately set the input string
-			// to the current value of the input field, so that
-			// it won't be set back to the pre-change value
-			setInputStringAndMaybeCallOnChange(
-				inputControl.current.value,
-				true
-			);
-			onBlurRef.current();
-		}
-	}, [] );
-
-	return (
-		<Dropdown
-			className={ classNames(
-				'woocommerce-date-time-picker-control',
-				className
-			) }
-			position="bottom left"
-			focusOnMount={ false }
-			// @ts-expect-error `onToggle` does exist.
-			onToggle={ callOnBlurIfDropdownIsNotOpening }
-			renderToggle={ ( { isOpen, onClose, onToggle } ) => (
-				<BaseControl id={ id } label={ label } help={ help }>
-					<InputControl
-						id={ id }
-						ref={ inputControl }
-						disabled={ disabled }
-						value={ getUserInputOrUpdatedCurrentDate() }
-						onChange={ ( newValue: string ) =>
-							debouncedSetInputStringAndMaybeCallOnChange(
-								newValue,
-								true
-							)
-						}
-						onBlur={ (
-							event: React.FocusEvent< HTMLInputElement >
-						) => {
-							if (
-								hasFocusLeftInputAndDropdownContent( event )
-							) {
-								// close the dropdown, which will also trigger
-								// the component's onBlur to be called
-								onClose();
-							}
-						} }
-						suffix={
-							<Icon
-								icon={ calendar }
-								className="calendar-icon woocommerce-date-time-picker-control__input-control__suffix"
-								onClick={ focusInputControl }
-								size={ 16 }
-							/>
-						}
-						placeholder={ placeholder }
-						describedBy={ sprintf(
-							/* translators: A datetime format */
-							__(
-								'Date input describing a selected date in format %s',
-								'woocommerce'
-							),
-							dateTimeFormat
-						) }
-						onFocus={ () => {
-							if ( isOpen ) {
-								return; // the dropdown is already open, do we don't need to do anything
-							}
-
-							onToggle(); // show the dropdown
-						} }
-						aria-expanded={ isOpen }
-					/>
-				</BaseControl>
-			) }
-			popoverProps={ {
-				className: 'woocommerce-date-time-picker-control__popover',
-			} }
-			renderContent={ () => {
-				const Picker = isDateOnlyPicker ? DatePicker : WpDateTimePicker;
-
-				return (
-					<Picker
-						// @ts-expect-error null is valid for currentDate
-						currentDate={
-							inputStringDateTime.isValid()
-								? formatDateTimeAsISO( inputStringDateTime )
-								: null
-						}
-						onChange={ ( newDateTimeISOString: string ) =>
-							setInputStringAndMaybeCallOnChange(
-								newDateTimeISOString,
-								false
-							)
-						}
-						is12Hour={ is12HourPicker }
-					/>
-				);
-			} }
-		/>
-	);
-};
+);
diff --git a/packages/js/components/src/experimental-select-control/README.md b/packages/js/components/src/experimental-select-control/README.md
index 2b33d9457e8..b02c562f378 100644
--- a/packages/js/components/src/experimental-select-control/README.md
+++ b/packages/js/components/src/experimental-select-control/README.md
@@ -105,4 +105,6 @@ Name | Type | Default | Description
 `onInputChange` | Function | `() => null` | A callback that fires when the user input has changed
 `onRemove` | Function | `() => null` | A callback that fires when a selected item has been removed
 `onSelect` | Function | `() => null` | A callback that fires when an item has been selected
-`selected` | Array or Item | `undefined` | An array of selected items or a single selected item
+`selected` | Array or Item | `undefined` | An array of selected items or a single selected item\
+`onKeyDown` | Function | `() => null` | A callback that fires when a key is pressed
+`readOnlyWhenClosed` | Boolean | `false` | Whether the input should be read-only when the menu is closed
diff --git a/packages/js/components/src/experimental-select-control/combo-box.scss b/packages/js/components/src/experimental-select-control/combo-box.scss
index 7faddd52a83..acb2426f6dc 100644
--- a/packages/js/components/src/experimental-select-control/combo-box.scss
+++ b/packages/js/components/src/experimental-select-control/combo-box.scss
@@ -18,7 +18,6 @@
 .woocommerce-experimental-select-control__items-wrapper {
 	display: flex;
 	flex-grow: 1;
-	flex-wrap: wrap;
 	align-items: center;
 	padding: 2px $gap-smaller;
 
diff --git a/packages/js/components/src/experimental-select-control/combo-box.tsx b/packages/js/components/src/experimental-select-control/combo-box.tsx
index a71a323ff94..9bbbea87778 100644
--- a/packages/js/components/src/experimental-select-control/combo-box.tsx
+++ b/packages/js/components/src/experimental-select-control/combo-box.tsx
@@ -75,8 +75,8 @@ export const ComboBox = ( {
 					<input
 						{ ...inputProps }
 						ref={ ( node ) => {
+							inputRef.current = node;
 							if ( typeof inputProps.ref === 'function' ) {
-								inputRef.current = node;
 								(
 									inputProps.ref as unknown as (
 										node: HTMLInputElement | null
diff --git a/packages/js/components/src/experimental-select-control/select-control.scss b/packages/js/components/src/experimental-select-control/select-control.scss
index cf71dadd8cd..0ec18150b59 100644
--- a/packages/js/components/src/experimental-select-control/select-control.scss
+++ b/packages/js/components/src/experimental-select-control/select-control.scss
@@ -12,6 +12,18 @@
 		border-color: var( --wp-admin-theme-color );
 	}
 
+	&.is-read-only.is-multiple.has-selected-items {
+		.woocommerce-experimental-select-control__combo-box-wrapper {
+			cursor: default;
+		}
+
+		.woocommerce-experimental-select-control__input {
+			opacity: 0;
+			width: 0;
+			height: 0;
+		}
+	}
+
 	&__label {
 		display: inline-block;
 		margin-bottom: $gap-smaller;
diff --git a/packages/js/components/src/experimental-select-control/select-control.tsx b/packages/js/components/src/experimental-select-control/select-control.tsx
index 7957e980d55..0bb76218a6e 100644
--- a/packages/js/components/src/experimental-select-control/select-control.tsx
+++ b/packages/js/components/src/experimental-select-control/select-control.tsx
@@ -9,13 +9,14 @@ import {
 	useMultipleSelection,
 	GetInputPropsOptions,
 } from 'downshift';
+import { useInstanceId } from '@wordpress/compose';
 import {
 	useState,
 	useEffect,
 	createElement,
 	Fragment,
 } from '@wordpress/element';
-import { search } from '@wordpress/icons';
+import { chevronDown } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -57,6 +58,7 @@ export type SelectControlProps< ItemType > = {
 	) => void;
 	onRemove?: ( item: ItemType ) => void;
 	onSelect?: ( selected: ItemType ) => void;
+	onKeyDown?: ( e: KeyboardEvent ) => void;
 	onFocus?: ( data: { inputValue: string } ) => void;
 	stateReducer?: (
 		state: UseComboboxState< ItemType | null >,
@@ -69,6 +71,8 @@ export type SelectControlProps< ItemType > = {
 	inputProps?: GetInputPropsOptions;
 	suffix?: JSX.Element | null;
 	showToggleButton?: boolean;
+	readOnlyWhenClosed?: boolean;
+
 	/**
 	 * This is a feature already implemented in downshift@7.0.0 through the
 	 * reducer. In order for us to use it this prop is added temporarily until
@@ -117,18 +121,24 @@ function SelectControl< ItemType = DefaultItemType >( {
 	onRemove = () => null,
 	onSelect = () => null,
 	onFocus = () => null,
+	onKeyDown = () => null,
 	stateReducer = ( state, actionAndChanges ) => actionAndChanges.changes,
 	placeholder,
 	selected,
 	className,
 	disabled,
 	inputProps = {},
-	suffix = <SuffixIcon icon={ search } />,
+	suffix = <SuffixIcon icon={ chevronDown } />,
 	showToggleButton = false,
+	readOnlyWhenClosed = true,
 	__experimentalOpenMenuOnFocus = false,
 }: SelectControlProps< ItemType > ) {
 	const [ isFocused, setIsFocused ] = useState( false );
 	const [ inputValue, setInputValue ] = useState( '' );
+	const instanceId = useInstanceId(
+		SelectControl,
+		'woocommerce-experimental-select-control'
+	);
 
 	let selectedItems = selected === null ? [] : selected;
 	selectedItems = Array.isArray( selectedItems )
@@ -230,15 +240,24 @@ function SelectControl< ItemType = DefaultItemType >( {
 		},
 	} );
 
+	const isEventOutside = ( event: React.FocusEvent ) => {
+		return ! document
+			.querySelector( '.' + instanceId )
+			?.contains( event.relatedTarget );
+	};
+
 	const onRemoveItem = ( item: ItemType ) => {
 		selectItem( null );
 		removeSelectedItem( item );
 		onRemove( item );
 	};
 
+	const isReadOnly = readOnlyWhenClosed && ! isOpen && ! isFocused;
+
 	const selectedItemTags = multiple ? (
 		<SelectedItems
 			items={ selectedItems }
+			isReadOnly={ isReadOnly }
 			getItemLabel={ getItemLabel }
 			getItemValue={ getItemValue }
 			getSelectedItemProps={ getSelectedItemProps }
@@ -251,8 +270,12 @@ function SelectControl< ItemType = DefaultItemType >( {
 			className={ classnames(
 				'woocommerce-experimental-select-control',
 				className,
+				instanceId,
 				{
+					'is-read-only': isReadOnly,
 					'is-focused': isFocused,
+					'is-multiple': multiple,
+					'has-selected-items': selectedItems.length,
 				}
 			) }
 		>
@@ -282,7 +305,12 @@ function SelectControl< ItemType = DefaultItemType >( {
 							openMenu();
 						}
 					},
-					onBlur: () => setIsFocused( false ),
+					onBlur: ( event: React.FocusEvent ) => {
+						if ( isEventOutside( event ) ) {
+							setIsFocused( false );
+						}
+					},
+					onKeyDown,
 					placeholder,
 					disabled,
 					...inputProps,
diff --git a/packages/js/components/src/experimental-select-control/selected-items.scss b/packages/js/components/src/experimental-select-control/selected-items.scss
index 8f7c223483a..424bb40b9b9 100644
--- a/packages/js/components/src/experimental-select-control/selected-items.scss
+++ b/packages/js/components/src/experimental-select-control/selected-items.scss
@@ -1,3 +1,13 @@
+.woocommerce-experimental-select-control__selected-items {
+    flex-wrap: wrap;
+
+    &.is-read-only {
+        font-size: 13px;
+        color: $gray-900;
+        font-family: var(--wp--preset--font-family--system-font);
+    }
+}
+
 .woocommerce-experimental-select-control__selected-item {
     margin-right: $gap-smallest;
     margin-top: 2px;
diff --git a/packages/js/components/src/experimental-select-control/selected-items.tsx b/packages/js/components/src/experimental-select-control/selected-items.tsx
index 65aab895f76..6f82039e640 100644
--- a/packages/js/components/src/experimental-select-control/selected-items.tsx
+++ b/packages/js/components/src/experimental-select-control/selected-items.tsx
@@ -1,7 +1,8 @@
 /**
  * External dependencies
  */
-import { createElement, Fragment } from '@wordpress/element';
+import classnames from 'classnames';
+import { createElement } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -10,6 +11,7 @@ import Tag from '../tag';
 import { getItemLabelType, getItemValueType } from './types';
 
 type SelectedItemsProps< ItemType > = {
+	isReadOnly: boolean;
 	items: ItemType[];
 	getItemLabel: getItemLabelType< ItemType >;
 	getItemValue: getItemValueType< ItemType >;
@@ -22,14 +24,34 @@ type SelectedItemsProps< ItemType > = {
 };
 
 export const SelectedItems = < ItemType, >( {
+	isReadOnly,
 	items,
 	getItemLabel,
 	getItemValue,
 	getSelectedItemProps,
 	onRemove,
 }: SelectedItemsProps< ItemType > ) => {
+	const classes = classnames(
+		'woocommerce-experimental-select-control__selected-items',
+		{
+			'is-read-only': isReadOnly,
+		}
+	);
+
+	if ( isReadOnly ) {
+		return (
+			<div className={ classes }>
+				{ items
+					.map( ( item ) => {
+						return getItemLabel( item );
+					} )
+					.join( ', ' ) }
+			</div>
+		);
+	}
+
 	return (
-		<>
+		<div className={ classes }>
 			{ items.map( ( item, index ) => {
 				return (
 					// Disable reason: We prevent the default action to keep the input focused on click.
@@ -42,6 +64,9 @@ export const SelectedItems = < ItemType, >( {
 							selectedItem: item,
 							index,
 						} ) }
+						onMouseDown={ ( event ) => {
+							event.preventDefault();
+						} }
 						onClick={ ( event ) => {
 							event.preventDefault();
 						} }
@@ -56,6 +81,6 @@ export const SelectedItems = < ItemType, >( {
 					</div>
 				);
 			} ) }
-		</>
+		</div>
 	);
 };
diff --git a/packages/js/components/src/experimental-select-tree-control/select-tree-menu.tsx b/packages/js/components/src/experimental-select-tree-control/select-tree-menu.tsx
index 294ceafef60..fe26480d94b 100644
--- a/packages/js/components/src/experimental-select-tree-control/select-tree-menu.tsx
+++ b/packages/js/components/src/experimental-select-tree-control/select-tree-menu.tsx
@@ -22,6 +22,7 @@ import {
 } from '../experimental-tree-control';
 
 type MenuProps = {
+	isEventOutside: ( event: React.FocusEvent ) => boolean;
 	isOpen: boolean;
 	isLoading?: boolean;
 	position?: Popover.Position;
@@ -32,6 +33,7 @@ type MenuProps = {
 } & Omit< TreeControlProps, 'items' >;
 
 export const SelectTreeMenu = ( {
+	isEventOutside,
 	isLoading,
 	isOpen,
 	className,
@@ -103,8 +105,10 @@ export const SelectTreeMenu = ( {
 					) }
 					position={ position }
 					animate={ false }
-					onFocusOutside={ () => {
-						onClose();
+					onFocusOutside={ ( event ) => {
+						if ( isEventOutside( event ) ) {
+							onClose();
+						}
 					} }
 				>
 					{ isOpen && (
diff --git a/packages/js/components/src/experimental-select-tree-control/select-tree.tsx b/packages/js/components/src/experimental-select-tree-control/select-tree.tsx
index 5c276342cc8..114e696326b 100644
--- a/packages/js/components/src/experimental-select-tree-control/select-tree.tsx
+++ b/packages/js/components/src/experimental-select-tree-control/select-tree.tsx
@@ -1,11 +1,11 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * External dependencies
  */
-import { createElement, useState } from '@wordpress/element';
+import { chevronDown } from '@wordpress/icons';
 import classNames from 'classnames';
-import { search } from '@wordpress/icons';
+import { createElement, useState } from '@wordpress/element';
 import { useInstanceId } from '@wordpress/compose';
+import { BaseControl, TextControl } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -19,8 +19,7 @@ import { SelectTreeMenu } from './select-tree-menu';
 
 interface SelectTreeProps extends TreeControlProps {
 	id: string;
-	selected?: Item[];
-	getSelectedItemProps?: any;
+	selected?: Item | Item[];
 	treeRef?: React.ForwardedRef< HTMLOListElement >;
 	suffix?: JSX.Element | null;
 	isLoading?: boolean;
@@ -30,9 +29,8 @@ interface SelectTreeProps extends TreeControlProps {
 
 export const SelectTree = function SelectTree( {
 	items,
-	getSelectedItemProps,
 	treeRef: ref,
-	suffix = <SuffixIcon icon={ search } />,
+	suffix = <SuffixIcon icon={ chevronDown } />,
 	placeholder,
 	isLoading,
 	onInputChange,
@@ -40,114 +38,171 @@ export const SelectTree = function SelectTree( {
 	...props
 }: SelectTreeProps ) {
 	const linkedTree = useLinkedTree( items );
+	const selectTreeInstanceId = useInstanceId(
+		SelectTree,
+		'woocommerce-experimental-select-tree-control__dropdown'
+	);
 	const menuInstanceId = useInstanceId(
 		SelectTree,
 		'woocommerce-select-tree-control__menu'
 	);
+	const isEventOutside = ( event: React.FocusEvent ) => {
+		return ! document
+			.querySelector( '.' + selectTreeInstanceId )
+			?.contains( event.relatedTarget );
+	};
+
+	const recalculateInputValue = () => {
+		if ( onInputChange ) {
+			if ( ! props.multiple && props.selected ) {
+				onInputChange( ( props.selected as Item ).label );
+			} else {
+				onInputChange( '' );
+			}
+		}
+	};
+
+	const focusOnInput = () => {
+		(
+			document.querySelector( `#${ props.id }-input` ) as HTMLInputElement
+		 )?.focus();
+	};
 
 	const [ isFocused, setIsFocused ] = useState( false );
 	const [ isOpen, setIsOpen ] = useState( false );
+	const isReadOnly = ! isOpen && ! isFocused;
+
+	const inputProps: React.InputHTMLAttributes< HTMLInputElement > = {
+		className: 'woocommerce-experimental-select-control__input',
+		id: `${ props.id }-input`,
+		'aria-autocomplete': 'list',
+		'aria-controls': `${ props.id }-menu`,
+		autoComplete: 'off',
+		onFocus: () => {
+			if ( ! isOpen ) {
+				setIsOpen( true );
+			}
+			setIsFocused( true );
+		},
+		onBlur: ( event ) => {
+			if ( isOpen && isEventOutside( event ) ) {
+				setIsOpen( false );
+				recalculateInputValue();
+			}
+			setIsFocused( false );
+		},
+		onKeyDown: ( event ) => {
+			setIsOpen( true );
+			if ( event.key === 'ArrowDown' ) {
+				event.preventDefault();
+				// focus on the first element from the Popover
+				(
+					document.querySelector(
+						`.${ menuInstanceId } input, .${ menuInstanceId } button`
+					) as HTMLInputElement | HTMLButtonElement
+				 )?.focus();
+			}
+			if ( event.key === 'Tab' ) {
+				setIsOpen( false );
+				recalculateInputValue();
+			}
+		},
+		onChange: ( event ) =>
+			onInputChange && onInputChange( event.target.value ),
+		placeholder,
+	};
 
 	return (
 		<div
-			className="woocommerce-experimental-select-tree-control__dropdown"
+			className={ `woocommerce-experimental-select-tree-control__dropdown ${ selectTreeInstanceId }` }
 			tabIndex={ -1 }
 		>
 			<div
 				className={ classNames(
 					'woocommerce-experimental-select-control',
 					{
+						'is-read-only': isReadOnly,
 						'is-focused': isFocused,
+						'is-multiple': props.multiple,
+						'has-selected-items':
+							Array.isArray( props.selected ) &&
+							props.selected.length,
 					}
 				) }
 			>
-				<label
-					htmlFor={ `${ props.id }-input` }
-					id={ `${ props.id }-label` }
-					className="woocommerce-experimental-select-control__label"
-				>
-					{ props.label }
-				</label>
-				<ComboBox
-					comboBoxProps={ {
-						className:
-							'woocommerce-experimental-select-control__combo-box-wrapper',
-						role: 'combobox',
-						'aria-expanded': isOpen,
-						'aria-haspopup': 'tree',
-						'aria-labelledby': `${ props.id }-label`,
-						'aria-owns': `${ props.id }-menu`,
-					} }
-					inputProps={ {
-						className:
-							'woocommerce-experimental-select-control__input',
-						id: `${ props.id }-input`,
-						'aria-autocomplete': 'list',
-						'aria-controls': `${ props.id }-menu`,
-						autoComplete: 'off',
-						onFocus: () => {
-							if ( ! isOpen ) {
-								setIsOpen( true );
-							}
-							setIsFocused( true );
-						},
-						onBlur: ( event ) => {
-							// if blurring to an element inside the dropdown, don't close it
-							if (
-								isOpen &&
-								! document
-									.querySelector( '.' + menuInstanceId )
-									?.contains( event.relatedTarget )
-							) {
-								setIsOpen( false );
-							}
-							setIsFocused( false );
-						},
-						onKeyDown: ( event ) => {
-							setIsOpen( true );
-							if ( event.key === 'ArrowDown' ) {
-								event.preventDefault();
-								// focus on the first element from the Popover
-								(
-									document.querySelector(
-										`.${ menuInstanceId } input, .${ menuInstanceId } button`
-									) as HTMLInputElement | HTMLButtonElement
-								 )?.focus();
-							}
-							if ( event.key === 'Tab' ) {
-								setIsOpen( false );
-							}
-						},
-						onChange: ( event ) =>
-							onInputChange &&
-							onInputChange( event.target.value ),
-						placeholder,
-					} }
-					suffix={ suffix }
-				>
-					<SelectedItems
-						items={ ( props.selected as Item[] ) || [] }
-						getItemLabel={ ( item ) => item?.label || '' }
-						getItemValue={ ( item ) => item?.value || '' }
-						onRemove={ ( item ) => {
-							if ( ! Array.isArray( item ) && props.onRemove ) {
-								props.onRemove( item );
-								setIsOpen( false );
-							}
-						} }
-						getSelectedItemProps={ () => ( {} ) }
-					/>
-				</ComboBox>
+				<BaseControl label={ props.label } id={ `${ props.id }-input` }>
+					{ props.multiple ? (
+						<ComboBox
+							comboBoxProps={ {
+								className:
+									'woocommerce-experimental-select-control__combo-box-wrapper',
+								role: 'combobox',
+								'aria-expanded': isOpen,
+								'aria-haspopup': 'tree',
+								'aria-owns': `${ props.id }-menu`,
+							} }
+							inputProps={ inputProps }
+							suffix={ suffix }
+						>
+							<SelectedItems
+								isReadOnly={ isReadOnly }
+								items={ ( props.selected as Item[] ) || [] }
+								getItemLabel={ ( item ) => item?.label || '' }
+								getItemValue={ ( item ) => item?.value || '' }
+								onRemove={ ( item ) => {
+									if (
+										! Array.isArray( item ) &&
+										props.onRemove
+									) {
+										props.onRemove( item );
+									}
+								} }
+								getSelectedItemProps={ () => ( {} ) }
+							/>
+						</ComboBox>
+					) : (
+						<TextControl
+							{ ...inputProps }
+							value={ props.createValue || '' }
+							onChange={ ( value ) => {
+								if ( onInputChange ) onInputChange( value );
+								const item = items.find(
+									( i ) => i.label === value
+								);
+								if ( props.onSelect && item ) {
+									props.onSelect( item );
+								}
+								if ( ! value && props.onRemove ) {
+									props.onRemove( props.selected as Item );
+								}
+							} }
+						/>
+					) }
+				</BaseControl>
 			</div>
 			<SelectTreeMenu
 				{ ...props }
+				onSelect={ ( item ) => {
+					if ( ! props.multiple && onInputChange ) {
+						onInputChange( ( item as Item ).label );
+						setIsOpen( false );
+						setIsFocused( false );
+						focusOnInput();
+					}
+					if ( props.onSelect ) {
+						props.onSelect( item );
+					}
+				} }
 				id={ `${ props.id }-menu` }
 				className={ menuInstanceId.toString() }
 				ref={ ref }
+				isEventOutside={ isEventOutside }
 				isOpen={ isOpen }
 				items={ linkedTree }
 				shouldShowCreateButton={ shouldShowCreateButton }
-				onClose={ () => setIsOpen( false ) }
+				onClose={ () => {
+					setIsOpen( false );
+				} }
 			/>
 		</div>
 	);
diff --git a/packages/js/components/src/experimental-select-tree-control/stories/index.tsx b/packages/js/components/src/experimental-select-tree-control/stories/index.tsx
index 024f1e68e9e..3d6fad1cf13 100644
--- a/packages/js/components/src/experimental-select-tree-control/stories/index.tsx
+++ b/packages/js/components/src/experimental-select-tree-control/stories/index.tsx
@@ -162,6 +162,36 @@ export const SingleWithinModalUsingBodyDropdownPlacement: React.FC = () => {
 	);
 };
 
+export const SingleSelectTree: React.FC = () => {
+	const [ value, setValue ] = React.useState( '' );
+	const [ selected, setSelected ] = React.useState< Item | undefined >();
+
+	const items = filterItems( listItems, value );
+
+	return (
+		<SelectTree
+			id="single-select-tree"
+			label="Single Select Tree"
+			items={ items }
+			selected={ selected }
+			shouldNotRecursivelySelect
+			shouldShowCreateButton={ ( typedValue ) =>
+				! value ||
+				listItems.findIndex( ( item ) => item.label === typedValue ) ===
+					-1
+			}
+			createValue={ value }
+			// eslint-disable-next-line no-alert
+			onCreateNew={ () => alert( 'create new called' ) }
+			onInputChange={ ( a ) => setValue( a || '' ) }
+			onSelect={ ( selectedItems ) => {
+				setSelected( selectedItems as Item );
+			} }
+			onRemove={ () => setSelected( undefined ) }
+		/>
+	);
+};
+
 export default {
 	title: 'WooCommerce Admin/experimental/SelectTreeControl',
 	component: SelectTree,
diff --git a/packages/js/components/src/experimental-tree-control/hooks/use-selection.ts b/packages/js/components/src/experimental-tree-control/hooks/use-selection.ts
index 79e47bfc9ec..6ad08a558a5 100644
--- a/packages/js/components/src/experimental-tree-control/hooks/use-selection.ts
+++ b/packages/js/components/src/experimental-tree-control/hooks/use-selection.ts
@@ -122,8 +122,6 @@ export function useSelection( {
 			if ( item.children.length && ! shouldNotRecursivelySelect ) {
 				value.push( ...getDeepChildren( item ) );
 			}
-		} else if ( item.children?.length ) {
-			return;
 		}
 
 		if ( checked ) {
diff --git a/packages/js/components/src/experimental-tree-control/tree-item.scss b/packages/js/components/src/experimental-tree-control/tree-item.scss
index c3f51d28813..4f849e68fd1 100644
--- a/packages/js/components/src/experimental-tree-control/tree-item.scss
+++ b/packages/js/components/src/experimental-tree-control/tree-item.scss
@@ -45,10 +45,6 @@ $control-size: $gap-large;
 			margin: 0;
 		}
 
-		.components-radio-control__input {
-			@include screen-reader-only();
-		}
-
 		.components-checkbox-control__label {
 			display: none;
 		}
@@ -86,4 +82,8 @@ $control-size: $gap-large;
 			min-width: $control-size;
 		}
 	}
+
+	&__checkbox {
+		@include screen-reader-only();
+	}
 }
diff --git a/packages/js/components/src/experimental-tree-control/tree-item.tsx b/packages/js/components/src/experimental-tree-control/tree-item.tsx
index e7e487d7992..6f87e716b90 100644
--- a/packages/js/components/src/experimental-tree-control/tree-item.tsx
+++ b/packages/js/components/src/experimental-tree-control/tree-item.tsx
@@ -60,13 +60,11 @@ export const TreeItem = forwardRef( function ForwardedTreeItem(
 						/>
 					) : (
 						<input
-							type="radio"
+							type="checkbox"
+							className="experimental-woocommerce-tree-item__checkbox"
 							checked={ selection.checkedStatus === 'checked' }
-							className="components-radio-control__input"
 							onChange={ ( event ) =>
-								selection.onSelectChild(
-									event.currentTarget.checked
-								)
+								selection.onSelectChild( event.target.checked )
 							}
 						/>
 					) }
diff --git a/packages/js/components/src/experimental-tree-control/tree.tsx b/packages/js/components/src/experimental-tree-control/tree.tsx
index 491c6c161bd..48490d66c23 100644
--- a/packages/js/components/src/experimental-tree-control/tree.tsx
+++ b/packages/js/components/src/experimental-tree-control/tree.tsx
@@ -33,34 +33,36 @@ export const Tree = forwardRef( function ForwardedTree(
 
 	return (
 		<>
-			<ol
-				{ ...treeProps }
-				className={ classNames(
-					treeProps.className,
-					'experimental-woocommerce-tree',
-					`experimental-woocommerce-tree--level-${ level }`
-				) }
-			>
-				{ items.map( ( child, index ) => (
-					<TreeItem
-						{ ...treeItemProps }
-						isExpanded={ props.isExpanded }
-						key={ child.data.value }
-						item={ child }
-						index={ index }
-						// Button ref is not working, so need to use CSS directly
-						onLastItemLoop={ () => {
-							(
-								rootListRef.current
-									?.closest( 'ol[role="tree"]' )
-									?.parentElement?.querySelector(
-										'.experimental-woocommerce-tree__button'
-									) as HTMLButtonElement
-							 )?.focus();
-						} }
-					/>
-				) ) }
-			</ol>
+			{ items.length || isCreateButtonVisible ? (
+				<ol
+					{ ...treeProps }
+					className={ classNames(
+						treeProps.className,
+						'experimental-woocommerce-tree',
+						`experimental-woocommerce-tree--level-${ level }`
+					) }
+				>
+					{ items.map( ( child, index ) => (
+						<TreeItem
+							{ ...treeItemProps }
+							isExpanded={ props.isExpanded }
+							key={ child.data.value }
+							item={ child }
+							index={ index }
+							// Button ref is not working, so need to use CSS directly
+							onLastItemLoop={ () => {
+								(
+									rootListRef.current
+										?.closest( 'ol[role="tree"]' )
+										?.parentElement?.querySelector(
+											'.experimental-woocommerce-tree__button'
+										) as HTMLButtonElement
+								 )?.focus();
+							} }
+						/>
+					) ) }
+				</ol>
+			) : null }
 			{ isCreateButtonVisible && (
 				<Button
 					className="experimental-woocommerce-tree__button"
diff --git a/packages/js/components/src/filter-picker/README.md b/packages/js/components/src/filter-picker/README.md
index 6e29b59e69c..080d7435855 100644
--- a/packages/js/components/src/filter-picker/README.md
+++ b/packages/js/components/src/filter-picker/README.md
@@ -65,8 +65,8 @@ The `config` prop has the following structure:
 
 - `label`: String - A label above the filter selector.
 - `staticParams`: Array - Url parameters to persist when selecting a new filter.
-- `param`: String - The url paramter this filter will modify.
-- `defaultValue`: String - The default paramter value to use instead of 'all'.
+- `param`: String - The url parameter this filter will modify.
+- `defaultValue`: String - The default parameter value to use instead of 'all'.
 - `showFilters`: Function - Determine if the filter should be shown. Supply a function with the query object as an argument returning a boolean.
 - `filters`: Array - Array of filter objects.
 
diff --git a/packages/js/components/src/filter-picker/index.js b/packages/js/components/src/filter-picker/index.js
index 7fb1652c377..a88f5e91427 100644
--- a/packages/js/components/src/filter-picker/index.js
+++ b/packages/js/components/src/filter-picker/index.js
@@ -374,11 +374,11 @@ FilterPicker.propTypes = {
 		 */
 		staticParams: PropTypes.array.isRequired,
 		/**
-		 * The url paramter this filter will modify.
+		 * The url parameter this filter will modify.
 		 */
 		param: PropTypes.string.isRequired,
 		/**
-		 * The default paramter value to use instead of 'all'.
+		 * The default parameter value to use instead of 'all'.
 		 */
 		defaultValue: PropTypes.string,
 		/**
diff --git a/packages/js/components/src/image-gallery/image-gallery-toolbar.tsx b/packages/js/components/src/image-gallery/image-gallery-toolbar.tsx
index 8a325f157a5..325b0c4f07c 100644
--- a/packages/js/components/src/image-gallery/image-gallery-toolbar.tsx
+++ b/packages/js/components/src/image-gallery/image-gallery-toolbar.tsx
@@ -16,6 +16,7 @@ import { MediaUploadComponentType } from './types';
 
 export type ImageGalleryToolbarProps = {
 	childIndex: number;
+	allowDragging?: boolean;
 	moveItem: ( fromIndex: number, toIndex: number ) => void;
 	removeItem: ( removeIndex: number ) => void;
 	replaceItem: (
@@ -29,6 +30,7 @@ export type ImageGalleryToolbarProps = {
 
 export const ImageGalleryToolbar: React.FC< ImageGalleryToolbarProps > = ( {
 	childIndex,
+	allowDragging = true,
 	moveItem,
 	removeItem,
 	replaceItem,
@@ -60,12 +62,14 @@ export const ImageGalleryToolbar: React.FC< ImageGalleryToolbarProps > = ( {
 			>
 				{ ! isCoverItem && (
 					<ToolbarGroup>
-						<ToolbarButton
-							icon={ () => (
-								<SortableHandle itemIndex={ childIndex } />
-							) }
-							label={ __( 'Drag to reorder', 'woocommerce' ) }
-						/>
+						{ allowDragging && (
+							<ToolbarButton
+								icon={ () => (
+									<SortableHandle itemIndex={ childIndex } />
+								) }
+								label={ __( 'Drag to reorder', 'woocommerce' ) }
+							/>
+						) }
 						<ToolbarButton
 							disabled={ childIndex < 2 }
 							onClick={ () => movePrevious() }
diff --git a/packages/js/components/src/image-gallery/image-gallery-wrapper.tsx b/packages/js/components/src/image-gallery/image-gallery-wrapper.tsx
new file mode 100644
index 00000000000..faf2df092e4
--- /dev/null
+++ b/packages/js/components/src/image-gallery/image-gallery-wrapper.tsx
@@ -0,0 +1,52 @@
+/**
+ * External dependencies
+ */
+import { createElement } from '@wordpress/element';
+import { DragEventHandler } from 'react';
+
+/**
+ * Internal dependencies
+ */
+import { Sortable } from '../sortable';
+import { ImageGalleryChild } from './types';
+
+export type ImageGalleryWrapperProps = {
+	children: JSX.Element[];
+	allowDragging?: boolean;
+	onDragStart?: DragEventHandler< HTMLDivElement >;
+	onDragEnd?: DragEventHandler< HTMLDivElement >;
+	onDragOver?: DragEventHandler< HTMLLIElement >;
+	updateOrderedChildren?: ( items: ImageGalleryChild[] ) => void;
+};
+
+export const ImageGalleryWrapper: React.FC< ImageGalleryWrapperProps > = ( {
+	children,
+	allowDragging = true,
+	onDragStart = () => null,
+	onDragEnd = () => null,
+	onDragOver = () => null,
+	updateOrderedChildren = () => null,
+} ) => {
+	if ( allowDragging ) {
+		return (
+			<Sortable
+				isHorizontal
+				onOrderChange={ ( items ) => {
+					updateOrderedChildren( items );
+				} }
+				onDragStart={ ( event ) => {
+					onDragStart( event );
+				} }
+				onDragEnd={ ( event ) => {
+					onDragEnd( event );
+				} }
+				onDragOver={ onDragOver }
+			>
+				{ children }
+			</Sortable>
+		);
+	}
+	return (
+		<div className="woocommerce-image-gallery__wrapper">{ children }</div>
+	);
+};
diff --git a/packages/js/components/src/image-gallery/image-gallery.scss b/packages/js/components/src/image-gallery/image-gallery.scss
index 07d8a2c8f6c..fc4929baa77 100644
--- a/packages/js/components/src/image-gallery/image-gallery.scss
+++ b/packages/js/components/src/image-gallery/image-gallery.scss
@@ -3,7 +3,7 @@
         display: block;
     }
 
-    .woocommerce-sortable {
+    .woocommerce-sortable, &__wrapper {
         display: grid;
         grid-template-columns: inherit;
         grid-gap: $gap;
diff --git a/packages/js/components/src/image-gallery/image-gallery.tsx b/packages/js/components/src/image-gallery/image-gallery.tsx
index a8630591e34..c33d87ae43d 100644
--- a/packages/js/components/src/image-gallery/image-gallery.tsx
+++ b/packages/js/components/src/image-gallery/image-gallery.tsx
@@ -14,10 +14,11 @@ import { MediaItem, MediaUpload } from '@wordpress/media-utils';
 /**
  * Internal dependencies
  */
-import { Sortable, moveIndex } from '../sortable';
+import { moveIndex } from '../sortable';
 import { ImageGalleryToolbar } from './index';
 import { ImageGalleryChild, MediaUploadComponentType } from './types';
 import { removeItem, replaceItem } from './utils';
+import { ImageGalleryWrapper } from './image-gallery-wrapper';
 
 export type ImageGalleryProps = {
 	children: ImageGalleryChild | ImageGalleryChild[];
@@ -30,6 +31,7 @@ export type ImageGalleryProps = {
 		replaceIndex: number;
 		media: { id: number } & MediaItem;
 	} ) => void;
+	allowDragging?: boolean;
 	onSelectAsCover?: ( itemId: string | null ) => void;
 	onOrderChange?: ( items: ImageGalleryChild[] ) => void;
 	MediaUploadComponent?: MediaUploadComponentType;
@@ -41,6 +43,7 @@ export type ImageGalleryProps = {
 export const ImageGallery: React.FC< ImageGalleryProps > = ( {
 	children,
 	columns = 4,
+	allowDragging = true,
 	onSelectAsCover = () => null,
 	onOrderChange = () => null,
 	onRemove = () => null,
@@ -82,11 +85,9 @@ export const ImageGallery: React.FC< ImageGalleryProps > = ( {
 				gridTemplateColumns: 'min-content '.repeat( columns ),
 			} }
 		>
-			<Sortable
-				isHorizontal
-				onOrderChange={ ( items ) => {
-					updateOrderedChildren( items );
-				} }
+			<ImageGalleryWrapper
+				allowDragging={ allowDragging }
+				updateOrderedChildren={ updateOrderedChildren }
 				onDragStart={ ( event ) => {
 					setIsDragging( true );
 					onDragStart( event );
@@ -137,6 +138,7 @@ export const ImageGallery: React.FC< ImageGalleryProps > = ( {
 						},
 						isToolbarVisible ? (
 							<ImageGalleryToolbar
+								allowDragging={ allowDragging }
 								childIndex={ childIndex }
 								lastChild={
 									childIndex === orderedChildren.length - 1
@@ -190,7 +192,7 @@ export const ImageGallery: React.FC< ImageGalleryProps > = ( {
 						) : null
 					);
 				} ) }
-			</Sortable>
+			</ImageGalleryWrapper>
 		</div>
 	);
 };
diff --git a/packages/js/components/src/rich-text-editor/editor-writing-flow.tsx b/packages/js/components/src/rich-text-editor/editor-writing-flow.tsx
index 5ee9e57dbdf..2726dc0cee8 100644
--- a/packages/js/components/src/rich-text-editor/editor-writing-flow.tsx
+++ b/packages/js/components/src/rich-text-editor/editor-writing-flow.tsx
@@ -45,7 +45,7 @@ export const EditorWritingFlow = ( {
 		};
 	} );
 
-	// This is a workaround to prevent focusing the block on intialization.
+	// This is a workaround to prevent focusing the block on initialization.
 	// Changing to a mode other than "edit" ensures that no initial position
 	// is found and no element gets subsequently focused.
 	// See https://github.com/WordPress/gutenberg/blob/411b6eee8376e31bf9db4c15c92a80524ae38e9b/packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js#L42
diff --git a/packages/js/components/src/search-list-control/test/hierarchy.js b/packages/js/components/src/search-list-control/test/hierarchy.js
index b5d53216619..1a04d6abc69 100644
--- a/packages/js/components/src/search-list-control/test/hierarchy.js
+++ b/packages/js/components/src/search-list-control/test/hierarchy.js
@@ -153,7 +153,7 @@ describe( 'buildTermsTree', () => {
 		] );
 	} );
 
-	test( 'should return a tree of items, with orphan categories appended to the end, with children of thier own', () => {
+	test( 'should return a tree of items, with orphan categories appended to the end, with children of their own', () => {
 		const filteredList = [
 			{ id: 1, name: 'Apricots', parent: 0 },
 			{ id: 3, name: 'Elderberry', parent: 2 },
diff --git a/packages/js/components/src/select-control/control.js b/packages/js/components/src/select-control/control.tsx
similarity index 69%
rename from packages/js/components/src/select-control/control.js
rename to packages/js/components/src/select-control/control.tsx
index 931a4e425a2..a1864674663 100644
--- a/packages/js/components/src/select-control/control.js
+++ b/packages/js/components/src/select-control/control.tsx
@@ -6,18 +6,149 @@ import { BACKSPACE, DOWN, UP } from '@wordpress/keycodes';
 import { createElement, Component, createRef } from '@wordpress/element';
 import { Icon, search } from '@wordpress/icons';
 import classnames from 'classnames';
-import PropTypes from 'prop-types';
+import { isArray } from 'lodash';
+import {
+	RefObject,
+	ChangeEvent,
+	FocusEvent,
+	KeyboardEvent,
+	InputHTMLAttributes,
+} from 'react';
 
 /**
  * Internal dependencies
  */
 import Tags from './tags';
+import { Selected, Option } from './types';
+
+type Props = {
+	/**
+	 * Bool to determine if tags should be rendered.
+	 */
+	hasTags?: boolean;
+	/**
+	 * Help text to be appended beneath the input.
+	 */
+	help?: string | JSX.Element;
+	/**
+	 * Render tags inside input, otherwise render below input.
+	 */
+	inlineTags?: boolean;
+	/**
+	 * Allow the select options to be filtered by search input.
+	 */
+	isSearchable?: boolean;
+	/**
+	 * ID of the main SelectControl instance.
+	 */
+	instanceId?: number;
+	/**
+	 * A label to use for the main input.
+	 */
+	label?: string;
+	/**
+	 * ID used for a11y in the listbox.
+	 */
+	listboxId?: string;
+	/**
+	 * Function called when the input is blurred.
+	 */
+	onBlur?: () => void;
+	/**
+	 * Function called when selected results change, passed result list.
+	 */
+	onChange: ( selected: Option[] ) => void;
+	/**
+	 * Function called when input field is changed or focused.
+	 */
+	onSearch: ( query: string ) => void;
+	/**
+	 * A placeholder for the search input.
+	 */
+	placeholder?: string;
+	/**
+	 * Search query entered by user.
+	 */
+	query?: string | null;
+	/**
+	 * An array of objects describing selected values. If the label of the selected
+	 * value is omitted, the Tag of that value will not be rendered inside the
+	 * search box.
+	 */
+	selected?: Selected;
+	/**
+	 * Show all options on focusing, even if a query exists.
+	 */
+	showAllOnFocus?: boolean;
+	/**
+	 * Control input autocomplete field, defaults: off.
+	 */
+	autoComplete?: string;
+	/**
+	 * Function to execute when the control should be expanded or collapsed.
+	 */
+	setExpanded: ( expanded: boolean ) => void;
+	/**
+	 * Function to execute when the search value changes.
+	 */
+	updateSearchOptions: ( query: string ) => void;
+	/**
+	 * Function to execute when keyboard navigation should decrement the selected index.
+	 */
+	decrementSelectedIndex: () => void;
+	/**
+	 * Function to execute when keyboard navigation should increment the selected index.
+	 */
+	incrementSelectedIndex: () => void;
+	/**
+	 * Multi-select mode allows multiple options to be selected.
+	 */
+	multiple?: boolean;
+	/**
+	 * Is the control currently focused.
+	 */
+	isFocused?: boolean;
+	/**
+	 * ID for accessibility purposes. aria-activedescendant will be set to this value.
+	 */
+	activeId?: string;
+	/**
+	 * Disable the control.
+	 */
+	disabled?: boolean;
+	/**
+	 * Is the control currently expanded. This is for accessibility purposes.
+	 */
+	isExpanded?: boolean;
+	/**
+	 * The type of input to use for the search field.
+	 */
+	searchInputType?: InputHTMLAttributes< HTMLInputElement >[ 'type' ];
+	/**
+	 * The aria label for the search input.
+	 */
+	ariaLabel?: string;
+	/**
+	 * Class name to be added to the input.
+	 */
+	className?: string;
+	/**
+	 * Show the clear button.
+	 */
+	showClearButton?: boolean;
+};
+
+type State = {
+	isActive: boolean;
+};
 
 /**
  * A search control to allow user input to filter the options.
  */
-class Control extends Component {
-	constructor( props ) {
+class Control extends Component< Props, State > {
+	input: RefObject< HTMLInputElement >;
+
+	constructor( props: Props ) {
 		super( props );
 		this.state = {
 			isActive: false,
@@ -31,13 +162,13 @@ class Control extends Component {
 		this.onKeyDown = this.onKeyDown.bind( this );
 	}
 
-	updateSearch( onSearch ) {
-		return ( event ) => {
+	updateSearch( onSearch: ( query: string ) => void ) {
+		return ( event: ChangeEvent< HTMLInputElement > ) => {
 			onSearch( event.target.value );
 		};
 	}
 
-	onFocus( onSearch ) {
+	onFocus( onSearch: ( query: string ) => void ) {
 		const {
 			isSearchable,
 			setExpanded,
@@ -45,7 +176,7 @@ class Control extends Component {
 			updateSearchOptions,
 		} = this.props;
 
-		return ( event ) => {
+		return ( event: FocusEvent< HTMLInputElement > ) => {
 			this.setState( { isActive: true } );
 			if ( isSearchable && showAllOnFocus ) {
 				event.target.select();
@@ -68,7 +199,7 @@ class Control extends Component {
 		this.setState( { isActive: false } );
 	}
 
-	onKeyDown( event ) {
+	onKeyDown( event: KeyboardEvent< HTMLInputElement > ) {
 		const {
 			decrementSelectedIndex,
 			incrementSelectedIndex,
@@ -78,7 +209,12 @@ class Control extends Component {
 			setExpanded,
 		} = this.props;
 
-		if ( BACKSPACE === event.keyCode && ! query && selected.length ) {
+		if (
+			BACKSPACE === event.keyCode &&
+			! query &&
+			isArray( selected ) &&
+			selected.length
+		) {
 			onChange( [ ...selected.slice( 0, -1 ) ] );
 		}
 
@@ -100,7 +236,7 @@ class Control extends Component {
 	renderButton() {
 		const { multiple, selected } = this.props;
 
-		if ( multiple || ! selected.length ) {
+		if ( multiple || ! isArray( selected ) || ! selected.length ) {
 			return null;
 		}
 
@@ -151,7 +287,7 @@ class Control extends Component {
 				aria-describedby={
 					hasTags && inlineTags
 						? `search-inline-input-${ instanceId }`
-						: null
+						: undefined
 				}
 				disabled={ disabled }
 				aria-label={ this.props.ariaLabel ?? this.props.label }
@@ -168,7 +304,8 @@ class Control extends Component {
 			query,
 			selected,
 		} = this.props;
-		const selectedValue = selected.length ? selected[ 0 ].label : '';
+		const selectedValue =
+			isArray( selected ) && selected.length ? selected[ 0 ].label : '';
 
 		// Show the selected value for simple select dropdowns.
 		if ( ! multiple && ! isFocused && ! inlineTags ) {
@@ -194,6 +331,8 @@ class Control extends Component {
 			isSearchable,
 			label,
 			query,
+			onChange,
+			showClearButton,
 		} = this.props;
 		const { isActive } = this.state;
 
@@ -213,7 +352,7 @@ class Control extends Component {
 						empty: ! query || query.length === 0,
 						'is-active': isActive,
 						'has-tags': inlineTags && hasTags,
-						'with-value': this.getInputValue().length,
+						'with-value': this.getInputValue()?.length,
 						'has-error': !! help,
 						'is-disabled': disabled,
 					}
@@ -221,8 +360,11 @@ class Control extends Component {
 				onClick={ ( event ) => {
 					// Don't focus the input if the click event is from the error message.
 					if (
+						// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+						// @ts-ignore - event.target.className is not in the type definition.
 						event.target.className !==
-						'components-base-control__help'
+							'components-base-control__help' &&
+						this.input.current
 					) {
 						this.input.current.focus();
 					}
@@ -234,7 +376,13 @@ class Control extends Component {
 						icon={ search }
 					/>
 				) }
-				{ inlineTags && <Tags { ...this.props } /> }
+				{ inlineTags && (
+					<Tags
+						onChange={ onChange }
+						showClearButton={ showClearButton }
+						selected={ this.props.selected }
+					/>
+				) }
 
 				<div className="components-base-control__field">
 					{ !! label && (
@@ -272,75 +420,4 @@ class Control extends Component {
 	}
 }
 
-Control.propTypes = {
-	/**
-	 * Bool to determine if tags should be rendered.
-	 */
-	hasTags: PropTypes.bool,
-	/**
-	 * Help text to be appended beneath the input.
-	 */
-	help: PropTypes.oneOfType( [ PropTypes.string, PropTypes.node ] ),
-	/**
-	 * Render tags inside input, otherwise render below input.
-	 */
-	inlineTags: PropTypes.bool,
-	/**
-	 * Allow the select options to be filtered by search input.
-	 */
-	isSearchable: PropTypes.bool,
-	/**
-	 * ID of the main SelectControl instance.
-	 */
-	instanceId: PropTypes.number,
-	/**
-	 * A label to use for the main input.
-	 */
-	label: PropTypes.string,
-	/**
-	 * ID used for a11y in the listbox.
-	 */
-	listboxId: PropTypes.string,
-	/**
-	 * Function called when the input is blurred.
-	 */
-	onBlur: PropTypes.func,
-	/**
-	 * Function called when selected results change, passed result list.
-	 */
-	onChange: PropTypes.func,
-	/**
-	 * Function called when input field is changed or focused.
-	 */
-	onSearch: PropTypes.func,
-	/**
-	 * A placeholder for the search input.
-	 */
-	placeholder: PropTypes.string,
-	/**
-	 * Search query entered by user.
-	 */
-	query: PropTypes.string,
-	/**
-	 * An array of objects describing selected values. If the label of the selected
-	 * value is omitted, the Tag of that value will not be rendered inside the
-	 * search box.
-	 */
-	selected: PropTypes.arrayOf(
-		PropTypes.shape( {
-			key: PropTypes.oneOfType( [ PropTypes.number, PropTypes.string ] )
-				.isRequired,
-			label: PropTypes.string,
-		} )
-	),
-	/**
-	 * Show all options on focusing, even if a query exists.
-	 */
-	showAllOnFocus: PropTypes.bool,
-	/**
-	 * Control input autocomplete field, defaults: off.
-	 */
-	autoComplete: PropTypes.string,
-};
-
 export default Control;
diff --git a/packages/js/components/src/select-control/index.js b/packages/js/components/src/select-control/index.tsx
similarity index 69%
rename from packages/js/components/src/select-control/index.js
rename to packages/js/components/src/select-control/index.tsx
index 2432af33a9a..c3110eaa272 100644
--- a/packages/js/components/src/select-control/index.js
+++ b/packages/js/components/src/select-control/index.tsx
@@ -4,26 +4,205 @@
 import { __, _n, sprintf } from '@wordpress/i18n';
 import classnames from 'classnames';
 import { Component, createElement } from '@wordpress/element';
-import { debounce, escapeRegExp, identity, noop } from 'lodash';
-import PropTypes from 'prop-types';
+import {
+	debounce,
+	escapeRegExp,
+	identity,
+	isArray,
+	isNumber,
+	noop,
+} from 'lodash';
 import { withFocusOutside, withSpokenMessages } from '@wordpress/components';
 import { withInstanceId, compose } from '@wordpress/compose';
+import { ChangeEvent, InputHTMLAttributes } from 'react';
 
 /**
  * Internal dependencies
  */
+import { Option, Selected } from './types';
 import List from './list';
 import Tags from './tags';
 import Control from './control';
 
-const initialState = { isExpanded: false, isFocused: false, query: '' };
+type Props = {
+	/**
+	 * Name to use for the autofill field, not used if no string is passed.
+	 */
+	autofill?: string;
+	/**
+	 * A renderable component (or string) which will be displayed before the `Control` of this component.
+	 */
+	children?: React.ReactNode;
+	/**
+	 * Class name applied to parent div.
+	 */
+	className?: string;
+	/**
+	 * Class name applied to control wrapper.
+	 */
+	controlClassName?: string;
+	/**
+	 * Allow the select options to be disabled.
+	 */
+	disabled?: boolean;
+	/**
+	 * Exclude already selected options from the options list.
+	 */
+	excludeSelectedOptions?: boolean;
+	/**
+	 * Add or remove items to the list of options after filtering,
+	 * passed the array of filtered options and should return an array of options.
+	 */
+	onFilter?: (
+		options: Array< Option >,
+		query: string | null
+	) => Array< Option >;
+	/**
+	 * Function to add regex expression to the filter the results, passed the search query.
+	 */
+	getSearchExpression?: ( query: string ) => RegExp;
+	/**
+	 * Help text to be appended beneath the input.
+	 */
+	help?: string | JSX.Element;
+	/**
+	 * Render tags inside input, otherwise render below input.
+	 */
+	inlineTags?: boolean;
+	/**
+	 * Allow the select options to be filtered by search input.
+	 */
+	isSearchable?: boolean;
+	/**
+	 * A label to use for the main input.
+	 */
+	label?: string;
+	/**
+	 * Function called when selected results change, passed result list.
+	 */
+	onChange?: ( selected: string | Option[], query?: string | null ) => void;
+	/**
+	 * Function run after search query is updated, passed previousOptions and query,
+	 * should return a promise with an array of updated options.
+	 */
+	onSearch?: (
+		previousOptions: Array< Option >,
+		query: string | null
+	) => Promise< Array< Option > >;
+	/**
+	 * An array of objects for the options list.  The option along with its key, label and
+	 * value will be returned in the onChange event.
+	 */
+	options: Option[];
+	/**
+	 * A placeholder for the search input.
+	 */
+	placeholder?: string;
+	/**
+	 * Time in milliseconds to debounce the search function after typing.
+	 */
+	searchDebounceTime?: number;
+	/**
+	 * An array of objects describing selected values or optionally a string for a single value.
+	 * If the label of the selected value is omitted, the Tag of that value will not
+	 * be rendered inside the search box.
+	 */
+	selected?: Selected;
+	/**
+	 * A limit for the number of results shown in the options menu.  Set to 0 for no limit.
+	 */
+	maxResults?: number;
+	/**
+	 * Allow multiple option selections.
+	 */
+	multiple?: boolean;
+	/**
+	 * Render a 'Clear' button next to the input box to remove its contents.
+	 */
+	showClearButton?: boolean;
+	/**
+	 * The input type for the search box control.
+	 */
+	searchInputType?: InputHTMLAttributes< HTMLInputElement >[ 'type' ];
+	/**
+	 * Only show list options after typing a search query.
+	 */
+	hideBeforeSearch?: boolean;
+	/**
+	 * Show all options on focusing, even if a query exists.
+	 */
+	showAllOnFocus?: boolean;
+	/**
+	 * Render results list positioned statically instead of absolutely.
+	 */
+	staticList?: boolean;
+	/**
+	 * autocomplete prop for the Control input field.
+	 */
+	autoComplete?: string;
+	/**
+	 * Instance ID for the component.
+	 */
+	instanceId?: number;
+	/**
+	 * From withSpokenMessages
+	 */
+	debouncedSpeak?: ( message: string, assertive?: string ) => void;
+	/**
+	 * aria-label for the search input.
+	 */
+	ariaLabel?: string;
+	/**
+	 * On Blur callback.
+	 */
+	onBlur?: () => void;
+};
+
+type State = {
+	isExpanded: boolean;
+	isFocused: boolean;
+	query: string | null;
+	searchOptions: Option[];
+	selectedIndex?: number | null;
+};
+
+const initialState: State = {
+	isExpanded: false,
+	isFocused: false,
+	query: '',
+	searchOptions: [],
+};
 
 /**
  * A search box which filters options while typing,
  * allowing a user to select from an option from a filtered list.
  */
-export class SelectControl extends Component {
-	constructor( props ) {
+export class SelectControl extends Component< Props, State > {
+	static defaultProps: Partial< Props > = {
+		excludeSelectedOptions: true,
+		getSearchExpression: identity,
+		inlineTags: false,
+		isSearchable: false,
+		onChange: noop,
+		onFilter: identity,
+		onSearch: ( options: Option[] ) => Promise.resolve( options ),
+		maxResults: 0,
+		multiple: false,
+		searchDebounceTime: 0,
+		searchInputType: 'search',
+		selected: [],
+		showAllOnFocus: false,
+		showClearButton: false,
+		hideBeforeSearch: false,
+		staticList: false,
+		autoComplete: 'off',
+	};
+
+	node: HTMLDivElement | null = null;
+	activePromise: Promise< void | Option[] > | null = null;
+	cacheSearchOptions: Option[] = [];
+
+	constructor( props: Props ) {
 		super( props );
 
 		const { selected, options, excludeSelectedOptions } = props;
@@ -50,7 +229,7 @@ export class SelectControl extends Component {
 		this.setNewValue = this.setNewValue.bind( this );
 	}
 
-	bindNode( node ) {
+	bindNode( node: HTMLDivElement ) {
 		this.node = node;
 	}
 
@@ -58,7 +237,12 @@ export class SelectControl extends Component {
 		const { multiple, excludeSelectedOptions } = this.props;
 		const newState = { ...initialState };
 		// Reset selectedIndex if single selection.
-		if ( ! multiple && selected.length && selected[ 0 ].key ) {
+		if (
+			! multiple &&
+			isArray( selected ) &&
+			selected.length &&
+			selected[ 0 ].key
+		) {
 			newState.selectedIndex = ! excludeSelectedOptions
 				? this.props.options.findIndex(
 						( i ) => i.key === selected[ 0 ].key
@@ -101,9 +285,12 @@ export class SelectControl extends Component {
 		return selectedOption ? [ selectedOption ] : [];
 	}
 
-	selectOption( option ) {
+	selectOption( option: Option ) {
 		const { multiple, selected } = this.props;
-		const newSelected = multiple ? [ ...selected, option ] : [ option ];
+		const newSelected =
+			multiple && isArray( selected )
+				? [ ...selected, option ]
+				: [ option ];
 
 		this.reset( newSelected );
 
@@ -129,25 +316,24 @@ export class SelectControl extends Component {
 		} );
 	}
 
-	setNewValue( newValue ) {
+	setNewValue( newValue: Option[] ) {
 		const { onChange, selected, multiple } = this.props;
 		const { query } = this.state;
 		// Trigger a change if the selected value is different and pass back
 		// an array or string depending on the original value.
 		if ( multiple || Array.isArray( selected ) ) {
-			onChange( newValue, query );
+			onChange!( newValue, query );
 		} else {
-			onChange( newValue.length > 0 ? newValue[ 0 ].key : '', query );
+			onChange!( newValue.length > 0 ? newValue[ 0 ].key : '', query );
 		}
 	}
 
 	decrementSelectedIndex() {
 		const { selectedIndex } = this.state;
 		const options = this.getOptions();
-		const nextSelectedIndex =
-			selectedIndex !== null
-				? ( selectedIndex === 0 ? options.length : selectedIndex ) - 1
-				: options.length - 1;
+		const nextSelectedIndex = isNumber( selectedIndex )
+			? ( selectedIndex === 0 ? options.length : selectedIndex ) - 1
+			: options.length - 1;
 
 		this.setState( { selectedIndex: nextSelectedIndex } );
 	}
@@ -155,13 +341,14 @@ export class SelectControl extends Component {
 	incrementSelectedIndex() {
 		const { selectedIndex } = this.state;
 		const options = this.getOptions();
-		const nextSelectedIndex =
-			selectedIndex !== null ? ( selectedIndex + 1 ) % options.length : 0;
+		const nextSelectedIndex = isNumber( selectedIndex )
+			? ( selectedIndex + 1 ) % options.length
+			: 0;
 
 		this.setState( { selectedIndex: nextSelectedIndex } );
 	}
 
-	announce( searchOptions ) {
+	announce( searchOptions: Option[] ) {
 		const { debouncedSpeak } = this.props;
 		if ( ! debouncedSpeak ) {
 			return;
@@ -169,6 +356,7 @@ export class SelectControl extends Component {
 		if ( !! searchOptions.length ) {
 			debouncedSpeak(
 				sprintf(
+					// translators: %d: number of results.
 					_n(
 						'%d result found, use up and down arrow keys to navigate.',
 						'%d results found, use up and down arrow keys to navigate.',
@@ -187,23 +375,26 @@ export class SelectControl extends Component {
 	getOptions() {
 		const { isSearchable, options, excludeSelectedOptions } = this.props;
 		const { searchOptions } = this.state;
-		const selectedKeys = this.getSelected().map( ( option ) => option.key );
+		const selected = this.getSelected();
+		const selectedKeys = isArray( selected )
+			? selected.map( ( option ) => option.key )
+			: [];
 		const shownOptions = isSearchable ? searchOptions : options;
 
 		if ( excludeSelectedOptions ) {
-			return shownOptions.filter(
+			return shownOptions?.filter(
 				( option ) => ! selectedKeys.includes( option.key )
 			);
 		}
 		return shownOptions;
 	}
 
-	getOptionsByQuery( options, query ) {
+	getOptionsByQuery( options: Option[], query: string | null ) {
 		const { getSearchExpression, maxResults, onFilter } = this.props;
 		const filtered = [];
 
 		// Create a regular expression to filter the options.
-		const expression = getSearchExpression(
+		const expression = getSearchExpression!(
 			escapeRegExp( query ? query.trim() : '' )
 		);
 		const search = expression ? new RegExp( expression, 'i' ) : /^$/;
@@ -232,14 +423,14 @@ export class SelectControl extends Component {
 			}
 		}
 
-		return onFilter( filtered, query );
+		return onFilter!( filtered, query );
 	}
 
-	setExpanded( value ) {
+	setExpanded( value: boolean ) {
 		this.setState( { isExpanded: value } );
 	}
 
-	search( query ) {
+	search( query: string | null ) {
 		const cacheSearchOptions = this.cacheSearchOptions || [];
 		const searchOptions =
 			query !== null && ! query.length && ! this.props.hideBeforeSearch
@@ -252,11 +443,13 @@ export class SelectControl extends Component {
 				isFocused: true,
 				searchOptions,
 				selectedIndex:
-					query?.length > 0 ? null : this.state.selectedIndex, // Only reset selectedIndex if we're actually searching.
+					query && query?.length > 0
+						? null
+						: this.state.selectedIndex, // Only reset selectedIndex if we're actually searching.
 			},
 			() => {
 				this.setState( {
-					isExpanded: Boolean( this.getOptions().length ),
+					isExpanded: Boolean( this.getOptions()?.length ),
 				} );
 			}
 		);
@@ -264,11 +457,11 @@ export class SelectControl extends Component {
 		this.updateSearchOptions( query );
 	}
 
-	updateSearchOptions( query ) {
+	updateSearchOptions( query: string | null ) {
 		const { hideBeforeSearch, options, onSearch } = this.props;
 
 		const promise = ( this.activePromise = Promise.resolve(
-			onSearch( options, query )
+			onSearch!( options, query )
 		).then( ( promiseOptions ) => {
 			if ( promise !== this.activePromise ) {
 				// Another promise has become active since this one was asked to resolve, so do nothing,
@@ -288,7 +481,9 @@ export class SelectControl extends Component {
 				{
 					searchOptions,
 					selectedIndex:
-						query?.length > 0 ? null : this.state.selectedIndex, // Only reset selectedIndex if we're actually searching.
+						query && query?.length > 0
+							? null
+							: this.state.selectedIndex, // Only reset selectedIndex if we're actually searching.
 				},
 				() => {
 					this.setState( {
@@ -300,7 +495,7 @@ export class SelectControl extends Component {
 		} ) );
 	}
 
-	onAutofillChange( event ) {
+	onAutofillChange( event: ChangeEvent< HTMLInputElement > ) {
 		const { options } = this.props;
 		const searchOptions = this.getOptionsByQuery(
 			options,
@@ -327,13 +522,14 @@ export class SelectControl extends Component {
 		const { isExpanded, isFocused, selectedIndex } = this.state;
 
 		const hasMultiple = this.hasMultiple();
-		const { key: selectedKey = '' } = options[ selectedIndex ] || {};
+		const { key: selectedKey = '' } =
+			( isNumber( selectedIndex ) && options[ selectedIndex ] ) || {};
 		const listboxId = isExpanded
 			? `woocommerce-select-control__listbox-${ instanceId }`
-			: null;
+			: undefined;
 		const activeId = isExpanded
 			? `woocommerce-select-control__option-${ instanceId }-${ selectedKey }`
-			: null;
+			: undefined;
 
 		return (
 			<div
@@ -354,13 +550,25 @@ export class SelectControl extends Component {
 						name={ autofill }
 						type="text"
 						className="woocommerce-select-control__autofill-input"
-						tabIndex="-1"
+						tabIndex={ -1 }
 					/>
 				) }
 				{ children }
 				<Control
-					{ ...this.props }
-					{ ...this.state }
+					help={ this.props.help }
+					label={ this.props.label }
+					inlineTags={ inlineTags }
+					isSearchable={ isSearchable }
+					isFocused={ isFocused }
+					instanceId={ instanceId }
+					searchInputType={ this.props.searchInputType }
+					query={ this.state.query }
+					placeholder={ this.props.placeholder }
+					autoComplete={ this.props.autoComplete }
+					multiple={ this.props.multiple }
+					ariaLabel={ this.props.ariaLabel }
+					onBlur={ this.props.onBlur }
+					showAllOnFocus={ this.props.showAllOnFocus }
 					activeId={ activeId }
 					className={ controlClassName }
 					disabled={ disabled }
@@ -374,15 +582,20 @@ export class SelectControl extends Component {
 					updateSearchOptions={ this.updateSearchOptions }
 					decrementSelectedIndex={ this.decrementSelectedIndex }
 					incrementSelectedIndex={ this.incrementSelectedIndex }
+					showClearButton={ this.props.showClearButton }
 				/>
 				{ ! inlineTags && hasMultiple && (
-					<Tags { ...this.props } selected={ this.getSelected() } />
+					<Tags
+						onChange={ this.props.onChange! }
+						showClearButton={ this.props.showClearButton }
+						selected={ this.getSelected() }
+					/>
 				) }
 				{ isExpanded && (
 					<List
-						{ ...this.props }
-						{ ...this.state }
-						activeId={ activeId }
+						instanceId={ instanceId! }
+						selectedIndex={ selectedIndex }
+						staticList={ this.props.staticList! }
 						listboxId={ listboxId }
 						node={ this.node }
 						onSelect={ this.selectOption }
@@ -398,171 +611,6 @@ export class SelectControl extends Component {
 	}
 }
 
-SelectControl.propTypes = {
-	/**
-	 * Name to use for the autofill field, not used if no string is passed.
-	 */
-	autofill: PropTypes.string,
-	/**
-	 * A renderable component (or string) which will be displayed before the `Control` of this component.
-	 */
-	children: PropTypes.node,
-	/**
-	 * Class name applied to parent div.
-	 */
-	className: PropTypes.string,
-	/**
-	 * Class name applied to control wrapper.
-	 */
-	controlClassName: PropTypes.string,
-	/**
-	 * Allow the select options to be disabled.
-	 */
-	disabled: PropTypes.bool,
-	/**
-	 * Exclude already selected options from the options list.
-	 */
-	excludeSelectedOptions: PropTypes.bool,
-	/**
-	 * Add or remove items to the list of options after filtering,
-	 * passed the array of filtered options and should return an array of options.
-	 */
-	onFilter: PropTypes.func,
-	/**
-	 * Function to add regex expression to the filter the results, passed the search query.
-	 */
-	getSearchExpression: PropTypes.func,
-	/**
-	 * Help text to be appended beneath the input.
-	 */
-	help: PropTypes.oneOfType( [ PropTypes.string, PropTypes.node ] ),
-	/**
-	 * Render tags inside input, otherwise render below input.
-	 */
-	inlineTags: PropTypes.bool,
-	/**
-	 * Allow the select options to be filtered by search input.
-	 */
-	isSearchable: PropTypes.bool,
-	/**
-	 * A label to use for the main input.
-	 */
-	label: PropTypes.string,
-	/**
-	 * Function called when selected results change, passed result list.
-	 */
-	onChange: PropTypes.func,
-	/**
-	 * Function run after search query is updated, passed previousOptions and query,
-	 * should return a promise with an array of updated options.
-	 */
-	onSearch: PropTypes.func,
-	/**
-	 * An array of objects for the options list.  The option along with its key, label and
-	 * value will be returned in the onChange event.
-	 */
-	options: PropTypes.arrayOf(
-		PropTypes.shape( {
-			isDisabled: PropTypes.bool,
-			key: PropTypes.oneOfType( [ PropTypes.number, PropTypes.string ] )
-				.isRequired,
-			keywords: PropTypes.arrayOf(
-				PropTypes.oneOfType( [ PropTypes.string, PropTypes.number ] )
-			),
-			label: PropTypes.oneOfType( [
-				PropTypes.string,
-				PropTypes.object,
-			] ),
-			value: PropTypes.any,
-		} )
-	).isRequired,
-	/**
-	 * A placeholder for the search input.
-	 */
-	placeholder: PropTypes.string,
-	/**
-	 * Time in milliseconds to debounce the search function after typing.
-	 */
-	searchDebounceTime: PropTypes.number,
-	/**
-	 * An array of objects describing selected values or optionally a string for a single value.
-	 * If the label of the selected value is omitted, the Tag of that value will not
-	 * be rendered inside the search box.
-	 */
-	selected: PropTypes.oneOfType( [
-		PropTypes.string,
-		PropTypes.arrayOf(
-			PropTypes.shape( {
-				key: PropTypes.oneOfType( [
-					PropTypes.number,
-					PropTypes.string,
-				] ).isRequired,
-				label: PropTypes.string,
-			} )
-		),
-	] ),
-	/**
-	 * A limit for the number of results shown in the options menu.  Set to 0 for no limit.
-	 */
-	maxResults: PropTypes.number,
-	/**
-	 * Allow multiple option selections.
-	 */
-	multiple: PropTypes.bool,
-	/**
-	 * Render a 'Clear' button next to the input box to remove its contents.
-	 */
-	showClearButton: PropTypes.bool,
-	/**
-	 * The input type for the search box control.
-	 */
-	searchInputType: PropTypes.oneOf( [
-		'text',
-		'search',
-		'number',
-		'email',
-		'tel',
-		'url',
-	] ),
-	/**
-	 * Only show list options after typing a search query.
-	 */
-	hideBeforeSearch: PropTypes.bool,
-	/**
-	 * Show all options on focusing, even if a query exists.
-	 */
-	showAllOnFocus: PropTypes.bool,
-	/**
-	 * Render results list positioned statically instead of absolutely.
-	 */
-	staticList: PropTypes.bool,
-	/**
-	 * autocomplete prop for the Control input field.
-	 */
-	autoComplete: PropTypes.string,
-};
-
-SelectControl.defaultProps = {
-	autofill: null,
-	excludeSelectedOptions: true,
-	getSearchExpression: identity,
-	inlineTags: false,
-	isSearchable: false,
-	onChange: noop,
-	onFilter: identity,
-	onSearch: ( options ) => Promise.resolve( options ),
-	maxResults: 0,
-	multiple: false,
-	searchDebounceTime: 0,
-	searchInputType: 'search',
-	selected: [],
-	showAllOnFocus: false,
-	showClearButton: false,
-	hideBeforeSearch: false,
-	staticList: false,
-	autoComplete: 'off',
-};
-
 export default compose(
 	withSpokenMessages,
 	withInstanceId,
diff --git a/packages/js/components/src/select-control/list.js b/packages/js/components/src/select-control/list.tsx
similarity index 68%
rename from packages/js/components/src/select-control/list.js
rename to packages/js/components/src/select-control/list.tsx
index 1ebaf9f829a..eabb1985b40 100644
--- a/packages/js/components/src/select-control/list.js
+++ b/packages/js/components/src/select-control/list.tsx
@@ -2,18 +2,73 @@
  * External dependencies
  */
 import { Button } from '@wordpress/components';
+import { RefObject } from 'react';
 import classnames from 'classnames';
 import { createElement, Component, createRef } from '@wordpress/element';
-import { isEqual } from 'lodash';
+import { isEqual, isNumber } from 'lodash';
 import { ENTER, ESCAPE, UP, DOWN, LEFT, RIGHT, TAB } from '@wordpress/keycodes';
-import PropTypes from 'prop-types';
+
+/**
+ * Internal dependencies
+ */
+import { Option } from './types';
+
+type Props = {
+	/**
+	 * ID of the main SelectControl instance.
+	 */
+	listboxId?: string;
+	/**
+	 * ID used for a11y in the listbox.
+	 */
+	instanceId: number;
+	/**
+	 * Parent node to bind keyboard events to.
+	 */
+	node: HTMLElement | null;
+	/**
+	 * Function to execute when an option is selected.
+	 */
+	onSelect: ( option: Option ) => void;
+	/**
+	 * Array of options to display.
+	 */
+	options: Array< Option >;
+	/**
+	 * Integer for the currently selected item.
+	 */
+	selectedIndex: number | null | undefined;
+	/**
+	 * Bool to determine if the list should be positioned absolutely or staticly.
+	 */
+	staticList: boolean;
+	/**
+	 * Function to execute when keyboard navigation should decrement the selected index.
+	 */
+	decrementSelectedIndex: () => void;
+	/**
+	 * Function to execute when keyboard navigation should increment the selected index.
+	 */
+	incrementSelectedIndex: () => void;
+	/**
+	 * Function to execute when the search value changes.
+	 */
+	onSearch: ( option: string | null ) => void;
+	/**
+	 * Function to execute when the list should be expanded or collapsed.
+	 */
+	setExpanded: ( expanded: boolean ) => void;
+};
 
 /**
  * A list box that displays filtered options after search.
  */
-class List extends Component {
-	constructor() {
-		super( ...arguments );
+class List extends Component< Props > {
+	optionRefs: { [ key: number ]: RefObject< HTMLButtonElement > };
+	listbox: RefObject< HTMLDivElement >;
+
+	constructor( props: Props ) {
+		super( props );
 
 		this.handleKeyDown = this.handleKeyDown.bind( this );
 		this.select = this.select.bind( this );
@@ -21,7 +76,7 @@ class List extends Component {
 		this.listbox = createRef();
 	}
 
-	componentDidUpdate( prevProps ) {
+	componentDidUpdate( prevProps: Props ) {
 		const { options, selectedIndex } = this.props;
 
 		// Remove old option refs to avoid memory leaks.
@@ -29,12 +84,15 @@ class List extends Component {
 			this.optionRefs = {};
 		}
 
-		if ( selectedIndex !== prevProps.selectedIndex ) {
+		if (
+			selectedIndex !== prevProps.selectedIndex &&
+			isNumber( selectedIndex )
+		) {
 			this.scrollToOption( selectedIndex );
 		}
 	}
 
-	getOptionRef( index ) {
+	getOptionRef( index: number ) {
 		if ( ! this.optionRefs.hasOwnProperty( index ) ) {
 			this.optionRefs[ index ] = createRef();
 		}
@@ -42,7 +100,7 @@ class List extends Component {
 		return this.optionRefs[ index ];
 	}
 
-	select( option ) {
+	select( option: Option ) {
 		const { onSelect } = this.props;
 
 		if ( option.isDisabled ) {
@@ -52,9 +110,13 @@ class List extends Component {
 		onSelect( option );
 	}
 
-	scrollToOption( index ) {
+	scrollToOption( index: number ) {
 		const listbox = this.listbox.current;
 
+		if ( ! listbox ) {
+			return;
+		}
+
 		if ( listbox.scrollHeight <= listbox.clientHeight ) {
 			return;
 		}
@@ -64,6 +126,12 @@ class List extends Component {
 		}
 
 		const option = this.optionRefs[ index ].current;
+		if ( ! option ) {
+			// eslint-disable-next-line no-console
+			console.warn( 'Option not found, index:', index );
+			return;
+		}
+
 		const scrollBottom = listbox.clientHeight + listbox.scrollTop;
 		const elementBottom = option.offsetTop + option.offsetHeight;
 		if ( elementBottom > scrollBottom ) {
@@ -73,7 +141,7 @@ class List extends Component {
 		}
 	}
 
-	handleKeyDown( event ) {
+	handleKeyDown( event: KeyboardEvent ) {
 		const {
 			decrementSelectedIndex,
 			incrementSelectedIndex,
@@ -100,7 +168,7 @@ class List extends Component {
 				break;
 
 			case ENTER:
-				if ( options[ selectedIndex ] ) {
+				if ( isNumber( selectedIndex ) && options[ selectedIndex ] ) {
 					this.select( options[ selectedIndex ] );
 				}
 				event.preventDefault();
@@ -118,7 +186,7 @@ class List extends Component {
 				return;
 
 			case TAB:
-				if ( options[ selectedIndex ] ) {
+				if ( isNumber( selectedIndex ) && options[ selectedIndex ] ) {
 					this.select( options[ selectedIndex ] );
 				}
 				setExpanded( false );
@@ -128,8 +196,14 @@ class List extends Component {
 		}
 	}
 
-	toggleKeyEvents( isListening ) {
+	toggleKeyEvents( isListening: boolean ) {
 		const { node } = this.props;
+		if ( ! node ) {
+			// eslint-disable-next-line no-console
+			console.warn( 'No node to bind events to.' );
+			return;
+		}
+
 		// This exists because we must capture ENTER key presses before RichText.
 		// It seems that react fires the simulated capturing events after the
 		// native browser event has already bubbled so we can't stopPropagation
@@ -138,12 +212,16 @@ class List extends Component {
 		const handler = isListening
 			? 'addEventListener'
 			: 'removeEventListener';
-		node[ handler ]( 'keydown', this.handleKeyDown, true );
+		node[ handler ](
+			'keydown',
+			this.handleKeyDown as ( e: Event ) => void,
+			true
+		);
 	}
 
 	componentDidMount() {
 		const { selectedIndex } = this.props;
-		if ( selectedIndex > -1 ) {
+		if ( isNumber( selectedIndex ) && selectedIndex > -1 ) {
 			this.scrollToOption( selectedIndex );
 		}
 		this.toggleKeyEvents( true );
@@ -169,7 +247,7 @@ class List extends Component {
 				id={ listboxId }
 				role="listbox"
 				className={ listboxClasses }
-				tabIndex="-1"
+				tabIndex={ -1 }
 			>
 				{ options.map( ( option, index ) => (
 					<Button
@@ -186,7 +264,7 @@ class List extends Component {
 							}
 						) }
 						onClick={ () => this.select( option ) }
-						tabIndex="-1"
+						tabIndex={ -1 }
 					>
 						{ option.label }
 					</Button>
@@ -196,50 +274,4 @@ class List extends Component {
 	}
 }
 
-List.propTypes = {
-	/**
-	 * ID of the main SelectControl instance.
-	 */
-	instanceId: PropTypes.number,
-	/**
-	 * ID used for a11y in the listbox.
-	 */
-	listboxId: PropTypes.string,
-	/**
-	 * Parent node to bind keyboard events to.
-	 */
-	// eslint-disable-next-line no-undef
-	node: PropTypes.instanceOf( Element ).isRequired,
-	/**
-	 * Function to execute when an option is selected.
-	 */
-	onSelect: PropTypes.func,
-	/**
-	 * Array of options to display.
-	 */
-	options: PropTypes.arrayOf(
-		PropTypes.shape( {
-			isDisabled: PropTypes.bool,
-			key: PropTypes.oneOfType( [ PropTypes.number, PropTypes.string ] )
-				.isRequired,
-			keywords: PropTypes.arrayOf(
-				PropTypes.oneOfType( [ PropTypes.string, PropTypes.number ] )
-			),
-			label: PropTypes.oneOfType( [
-				PropTypes.string,
-				PropTypes.object,
-			] ),
-			value: PropTypes.any,
-		} )
-	).isRequired,
-	/**
-	 * Integer for the currently selected item.
-	 */
-	selectedIndex: PropTypes.number,
-	/**
-	 * Bool to determine if the list should be positioned absolutely or staticly.
-	 */
-	staticList: PropTypes.bool,
-};
-
 export default List;
diff --git a/packages/js/components/src/select-control/stories/index.js b/packages/js/components/src/select-control/stories/index.tsx
similarity index 95%
rename from packages/js/components/src/select-control/stories/index.js
rename to packages/js/components/src/select-control/stories/index.tsx
index 9e0d5b0107f..292fb08f5a1 100644
--- a/packages/js/components/src/select-control/stories/index.js
+++ b/packages/js/components/src/select-control/stories/index.tsx
@@ -1,8 +1,12 @@
 /**
  * External dependencies
  */
-import { SelectControl } from '@woocommerce/components';
-import { useState } from '@wordpress/element';
+import React from 'react';
+import { createElement, useState } from '@wordpress/element';
+/**
+ * Internal dependencies
+ */
+import SelectControl from '../';
 
 const options = [
 	{
diff --git a/packages/js/components/src/select-control/tags.js b/packages/js/components/src/select-control/tags.tsx
similarity index 80%
rename from packages/js/components/src/select-control/tags.js
rename to packages/js/components/src/select-control/tags.tsx
index 296e27bd4b2..e1d33a5b247 100644
--- a/packages/js/components/src/select-control/tags.js
+++ b/packages/js/components/src/select-control/tags.tsx
@@ -5,19 +5,36 @@ import { __, sprintf } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import { Icon, cancelCircleFilled } from '@wordpress/icons';
 import { createElement, Component, Fragment } from '@wordpress/element';
-import { findIndex } from 'lodash';
-import PropTypes from 'prop-types';
+import { findIndex, isArray } from 'lodash';
 
 /**
  * Internal dependencies
  */
 import Tag from '../tag';
+import { Option, Selected } from './types';
+
+type Props = {
+	/**
+	 * Function called when selected results change, passed result list.
+	 */
+	onChange: ( selected: Option[] ) => void;
+	/**
+	 * An array of objects describing selected values. If the label of the selected
+	 * value is omitted, the Tag of that value will not be rendered inside the
+	 * search box.
+	 */
+	selected?: Selected;
+	/**
+	 * Render a 'Clear' button next to the input box to remove its contents.
+	 */
+	showClearButton?: boolean;
+};
 
 /**
  * A list of tags to display selected items.
  */
-class Tags extends Component {
-	constructor( props ) {
+class Tags extends Component< Props > {
+	constructor( props: Props ) {
 		super( props );
 		this.removeAll = this.removeAll.bind( this );
 		this.removeResult = this.removeResult.bind( this );
@@ -28,9 +45,13 @@ class Tags extends Component {
 		onChange( [] );
 	}
 
-	removeResult( key ) {
+	removeResult( key: string | undefined ) {
 		return () => {
 			const { selected, onChange } = this.props;
+			if ( ! isArray( selected ) ) {
+				return;
+			}
+
 			const i = findIndex( selected, { key } );
 			onChange( [
 				...selected.slice( 0, i ),
@@ -41,7 +62,7 @@ class Tags extends Component {
 
 	render() {
 		const { selected, showClearButton } = this.props;
-		if ( ! selected.length ) {
+		if ( ! isArray( selected ) || ! selected.length ) {
 			return null;
 		}
 
@@ -63,6 +84,7 @@ class Tags extends Component {
 								key={ item.key }
 								id={ item.key }
 								label={ item.label }
+								// @ts-expect-error key is a string or undefined here
 								remove={ this.removeResult }
 								screenReaderLabel={ screenReaderLabel }
 							/>
@@ -89,31 +111,4 @@ class Tags extends Component {
 	}
 }
 
-Tags.propTypes = {
-	/**
-	 * Function called when selected results change, passed result list.
-	 */
-	onChange: PropTypes.func,
-	/**
-	 * Function to execute when an option is selected.
-	 */
-	onSelect: PropTypes.func,
-	/**
-	 * An array of objects describing selected values. If the label of the selected
-	 * value is omitted, the Tag of that value will not be rendered inside the
-	 * search box.
-	 */
-	selected: PropTypes.arrayOf(
-		PropTypes.shape( {
-			key: PropTypes.oneOfType( [ PropTypes.number, PropTypes.string ] )
-				.isRequired,
-			label: PropTypes.string,
-		} )
-	),
-	/**
-	 * Render a 'Clear' button next to the input box to remove its contents.
-	 */
-	showClearButton: PropTypes.bool,
-};
-
 export default Tags;
diff --git a/packages/js/components/src/select-control/test/index.js b/packages/js/components/src/select-control/test/index.tsx
similarity index 95%
rename from packages/js/components/src/select-control/test/index.js
rename to packages/js/components/src/select-control/test/index.tsx
index 0cb6bfeb849..825fe0bdb1e 100644
--- a/packages/js/components/src/select-control/test/index.js
+++ b/packages/js/components/src/select-control/test/index.tsx
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import React from 'react';
 import { render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { createElement } from '@wordpress/element';
@@ -9,10 +10,11 @@ import { createElement } from '@wordpress/element';
  * Internal dependencies
  */
 import { SelectControl } from '../index';
+import { Option } from '../types';
 
 describe( 'SelectControl', () => {
 	const query = 'lorem';
-	const options = [
+	const options: Option[] = [
 		{ key: '1', label: 'lorem 1', value: { id: '1' } },
 		{ key: '2', label: 'lorem 2', value: { id: '2' } },
 		{ key: '3', label: 'bar', value: { id: '3' } },
@@ -168,9 +170,9 @@ describe( 'SelectControl', () => {
 	} );
 
 	it( 'changes the options on search', async () => {
-		const queriedOptions = [];
+		const queriedOptions: Option[] = [];
 		// eslint-disable-next-line @typescript-eslint/no-shadow
-		const queryOptions = ( options, searchedQuery ) => {
+		const queryOptions = async ( options: Option[], searchedQuery: string | null ) => {
 			if ( searchedQuery === 'test' ) {
 				queriedOptions.push( {
 					key: 'test-option',
@@ -209,7 +211,7 @@ describe( 'SelectControl', () => {
 				isSearchable
 				showAllOnFocus
 				options={ options }
-				onSearch={ () => options }
+				onSearch={ async () => options }
 				onFilter={ () => options }
 				onChange={ onChangeMock }
 			/>
@@ -229,7 +231,7 @@ describe( 'SelectControl', () => {
 					isSearchable
 					selected={ [ { ...options[ 0 ] } ] }
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
 					onChange={ onChangeMock }
 				/>
@@ -258,7 +260,7 @@ describe( 'SelectControl', () => {
 					isSearchable
 					selected={ options[ 0 ].key }
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
 					onChange={ onChangeMock }
 				/>
@@ -289,7 +291,7 @@ describe( 'SelectControl', () => {
 						showAllOnFocus
 						selected={ options[ 2 ].key }
 						options={ options }
-						onSearch={ () => options }
+						onSearch={ async () => options }
 						onFilter={ () => options }
 						onChange={ onChangeMock }
 						excludeSelectedOptions={ false }
@@ -316,7 +318,7 @@ describe( 'SelectControl', () => {
 						showAllOnFocus
 						selected={ options[ 2 ].key }
 						options={ options }
-						onSearch={ () => options }
+						onSearch={ async () => options }
 						onFilter={ () => options }
 						onChange={ onChangeMock }
 						excludeSelectedOptions={ false }
@@ -364,7 +366,7 @@ describe( 'SelectControl', () => {
 						isSearchable
 						selected={ [ { ...options[ 0 ] } ] }
 						options={ options }
-						onSearch={ () => options }
+						onSearch={ async () => options }
 						onFilter={ () => options }
 						onChange={ onChangeMock }
 					/>
@@ -383,7 +385,7 @@ describe( 'SelectControl', () => {
 						isSearchable
 						selected={ options[ 0 ].key }
 						options={ options }
-						onSearch={ () => options }
+						onSearch={ async () => options }
 						onFilter={ () => options }
 						onChange={ onChangeMock }
 					/>
@@ -416,9 +418,8 @@ describe( 'SelectControl', () => {
 			const { getByRole } = render(
 				<SelectControl
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
-					selected={ null }
 				/>
 			);
 
@@ -440,7 +441,7 @@ describe( 'SelectControl', () => {
 			const { getByRole } = render(
 				<SelectControl
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
 					selected={ options[ 1 ].key }
 					excludeSelectedOptions={ false }
@@ -465,7 +466,7 @@ describe( 'SelectControl', () => {
 			const { getByRole } = render(
 				<SelectControl
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
 					selected={ options[ options.length - 1 ].key }
 					excludeSelectedOptions={ false }
@@ -490,9 +491,8 @@ describe( 'SelectControl', () => {
 			const { getByRole } = render(
 				<SelectControl
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
-					selected={ null }
 				/>
 			);
 
@@ -514,9 +514,8 @@ describe( 'SelectControl', () => {
 			const { getByRole, queryByRole } = render(
 				<SelectControl
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
-					selected={ null }
 				/>
 			);
 
@@ -537,9 +536,8 @@ describe( 'SelectControl', () => {
 			const { getByRole } = render(
 				<SelectControl
 					options={ options }
-					onSearch={ () => options }
+					onSearch={ async () => options }
 					onFilter={ () => options }
-					selected={ null }
 					excludeSelectedOptions={ false }
 					onChange={ onChangeMock }
 				/>
diff --git a/packages/js/components/src/select-control/types.ts b/packages/js/components/src/select-control/types.ts
new file mode 100644
index 00000000000..6744615cdf6
--- /dev/null
+++ b/packages/js/components/src/select-control/types.ts
@@ -0,0 +1,9 @@
+export type Option = {
+	key: string;
+	label: string;
+	isDisabled?: boolean;
+	keywords?: Array< string >;
+	value?: unknown;
+};
+
+export type Selected = string | Option[];
diff --git a/packages/js/components/src/sortable/sortable.tsx b/packages/js/components/src/sortable/sortable.tsx
index c1e1f4e78f6..fbc175d45e5 100644
--- a/packages/js/components/src/sortable/sortable.tsx
+++ b/packages/js/components/src/sortable/sortable.tsx
@@ -110,7 +110,7 @@ export const Sortable = ( {
 
 		// Items before the current item cause a one off error when
 		// removed from the old array and spliced into the new array.
-		// TODO: Issue with dragging into same position having to do with isBefore returning true intially.
+		// TODO: Issue with dragging into same position having to do with isBefore returning true initially.
 		let targetIndex = dragIndex < index ? index : index + 1;
 		if ( isBefore( event, isHorizontal ) ) {
 			targetIndex--;
diff --git a/packages/js/components/src/table/README.md b/packages/js/components/src/table/README.md
index 54378b6dd25..2048d89a3b6 100644
--- a/packages/js/components/src/table/README.md
+++ b/packages/js/components/src/table/README.md
@@ -61,7 +61,7 @@ Name | Type | Default | Description
 `ids` | Array | `null` | A list of IDs, matching to the row list so that ids[ 0 ] contains the object ID for the object displayed in row[ 0 ]
 `isLoading` | Boolean | `false` | Defines if the table contents are loading. It will display `TablePlaceholder` component instead of `Table` if that's the case
 `onQueryChange` | Function | `noop` | A function which returns a callback function to update the query string for a given `param`
-`onColumnsChange` | Function | `noop` | A function which returns a callback function which is called upon the user changing the visiblity of columns
+`onColumnsChange` | Function | `noop` | A function which returns a callback function which is called upon the user changing the visibility of columns
 `onSearch` | Function | `noop` | A function which is called upon the user searching in the table header
 `onSort` | Function | `undefined` | A function which is called upon the user changing the sorting of the table
 `downloadable` | Boolean | `false` | Whether the table must be downloadable. If true, the download button will appear
diff --git a/packages/js/components/src/table/types.ts b/packages/js/components/src/table/types.ts
index 79b61e92a3d..6bd3b086894 100644
--- a/packages/js/components/src/table/types.ts
+++ b/packages/js/components/src/table/types.ts
@@ -158,7 +158,7 @@ export type TableCardProps = CommonTableProps & {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	onQueryChange?: ( param: string ) => ( ...props: any ) => void;
 	/**
-	 * A function which returns a callback function which is called upon the user changing the visiblity of columns.
+	 * A function which returns a callback function which is called upon the user changing the visibility of columns.
 	 */
 	onColumnsChange?: ( showCols: Array< string >, key?: string ) => void;
 	/**
diff --git a/packages/js/data/PREVIOUS_CHANGELOG.md b/packages/js/data/PREVIOUS_CHANGELOG.md
index 2bb5eb68baf..e0886007ce1 100644
--- a/packages/js/data/PREVIOUS_CHANGELOG.md
+++ b/packages/js/data/PREVIOUS_CHANGELOG.md
@@ -22,7 +22,7 @@
 ## Breaking changes
 
 -   Fix the batch fetch logic for the options data store. #7587
--   Add backwards compability for old function format. #7688
+-   Add backwards compatibility for old function format. #7688
 -   Add console warning for inbox note contents exceeding 320 characters and add dompurify dependency. #7869
 -   Fix race condition in data package's options module. #7947
 -   Remove dev dependency `@woocommerce/wc-admin-settings`. #8057
diff --git a/packages/js/data/changelog/dev-add-resolve-select-types b/packages/js/data/changelog/dev-add-resolve-select-types
new file mode 100644
index 00000000000..db3099c1ce9
--- /dev/null
+++ b/packages/js/data/changelog/dev-add-resolve-select-types
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Added types for resolveSelect where applicable.
diff --git a/packages/js/data/changelog/fix-37502 b/packages/js/data/changelog/fix-37502
new file mode 100644
index 00000000000..115429c4b01
--- /dev/null
+++ b/packages/js/data/changelog/fix-37502
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Correct spelling errors
diff --git a/packages/js/data/changelog/update-migrate-purchase-task-to-ts b/packages/js/data/changelog/update-migrate-purchase-task-to-ts
new file mode 100644
index 00000000000..c8ea79bf545
--- /dev/null
+++ b/packages/js/data/changelog/update-migrate-purchase-task-to-ts
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Fix onboarding productTypes TS define type
diff --git a/packages/js/data/changelog/update-payfast b/packages/js/data/changelog/update-payfast
new file mode 100644
index 00000000000..40e5dec5fce
--- /dev/null
+++ b/packages/js/data/changelog/update-payfast
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update Payfast title
diff --git a/packages/js/data/src/countries/index.ts b/packages/js/data/src/countries/index.ts
index de2e1f9d298..434a7812c65 100644
--- a/packages/js/data/src/countries/index.ts
+++ b/packages/js/data/src/countries/index.ts
@@ -14,6 +14,7 @@ import * as actions from './actions';
 import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
 import { WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -35,4 +36,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/export/index.ts b/packages/js/data/src/export/index.ts
index 278aee7dd12..f4cf1b2f874 100644
--- a/packages/js/data/src/export/index.ts
+++ b/packages/js/data/src/export/index.ts
@@ -13,6 +13,7 @@ import * as actions from './actions';
 import reducer, { State } from './reducer';
 import { WPDataSelectors } from '../types';
 import controls from '../controls';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -33,4 +34,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/import/index.ts b/packages/js/data/src/import/index.ts
index 327b16e91aa..78703711f8e 100644
--- a/packages/js/data/src/import/index.ts
+++ b/packages/js/data/src/import/index.ts
@@ -14,6 +14,7 @@ import * as actions from './actions';
 import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
 import { WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -35,4 +36,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/items/index.ts b/packages/js/data/src/items/index.ts
index bd6cb4938ae..8864c21e8db 100644
--- a/packages/js/data/src/items/index.ts
+++ b/packages/js/data/src/items/index.ts
@@ -15,6 +15,7 @@ import reducer, { State } from './reducer';
 import controls from '../controls';
 import { WPDataActions, WPDataSelectors } from '../types';
 import { getItemsType } from './selectors';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -40,4 +41,7 @@ declare module '@wordpress/data' {
 		key: typeof STORE_NAME
 	): DispatchFromMap< typeof actions & WPDataActions >;
 	function select( key: typeof STORE_NAME ): ItemsSelector;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< ItemsSelector >;
 }
diff --git a/packages/js/data/src/navigation/index.ts b/packages/js/data/src/navigation/index.ts
index 7e3b8155a0a..32983bb57cd 100644
--- a/packages/js/data/src/navigation/index.ts
+++ b/packages/js/data/src/navigation/index.ts
@@ -16,6 +16,7 @@ import reducer, { State } from './reducer';
 import * as resolvers from './resolvers';
 import initDispatchers from './dispatchers';
 import { WPDataActions, WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 
 registerStore< State >( STORE_NAME, {
 	reducer: reducer as Reducer< State, AnyAction >,
@@ -35,4 +36,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/notes/index.ts b/packages/js/data/src/notes/index.ts
index 852489a696d..8543d3554eb 100644
--- a/packages/js/data/src/notes/index.ts
+++ b/packages/js/data/src/notes/index.ts
@@ -15,6 +15,7 @@ import * as selectors from './selectors';
 import * as actions from './actions';
 import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 
 export * from './types';
 export type { State };
@@ -36,4 +37,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/onboarding/actions.ts b/packages/js/data/src/onboarding/actions.ts
index 8628f22031c..e46692dfca5 100644
--- a/packages/js/data/src/onboarding/actions.ts
+++ b/packages/js/data/src/onboarding/actions.ts
@@ -16,7 +16,7 @@ import {
 	ProfileItems,
 	TaskListType,
 	TaskType,
-	OnboardingProductType,
+	OnboardingProductTypes,
 } from './types';
 import { Plugin } from '../plugins/types';
 
@@ -267,9 +267,7 @@ export function actionTaskSuccess( task: Partial< TaskType > ) {
 	};
 }
 
-export function getProductTypesSuccess(
-	productTypes: OnboardingProductType[]
-) {
+export function getProductTypesSuccess( productTypes: OnboardingProductTypes ) {
 	return {
 		type: TYPES.GET_PRODUCT_TYPES_SUCCESS,
 		productTypes,
diff --git a/packages/js/data/src/onboarding/index.ts b/packages/js/data/src/onboarding/index.ts
index a1e5b73193d..c0af6023e7f 100644
--- a/packages/js/data/src/onboarding/index.ts
+++ b/packages/js/data/src/onboarding/index.ts
@@ -14,6 +14,7 @@ import * as actions from './actions';
 import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
 import { WPDataActions, WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -35,4 +36,7 @@ declare module '@wordpress/data' {
 		key: typeof STORE_NAME
 	): DispatchFromMap< typeof actions & WPDataActions >;
 	function select( key: typeof STORE_NAME ): OnboardingSelector;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< OnboardingSelector >;
 }
diff --git a/packages/js/data/src/onboarding/reducer.ts b/packages/js/data/src/onboarding/reducer.ts
index a3b32468989..da69fae2c92 100644
--- a/packages/js/data/src/onboarding/reducer.ts
+++ b/packages/js/data/src/onboarding/reducer.ts
@@ -35,7 +35,7 @@ export const defaultState: OnboardingState = {
 	},
 	emailPrefill: '',
 	paymentMethods: [],
-	productTypes: [],
+	productTypes: {},
 	requesting: {},
 	taskLists: {},
 };
diff --git a/packages/js/data/src/onboarding/resolvers.ts b/packages/js/data/src/onboarding/resolvers.ts
index 5bb69f5492b..8674a4e7d83 100644
--- a/packages/js/data/src/onboarding/resolvers.ts
+++ b/packages/js/data/src/onboarding/resolvers.ts
@@ -24,7 +24,7 @@ import {
 import { DeprecatedTasks } from './deprecated-tasks';
 import {
 	ExtensionList,
-	OnboardingProductType,
+	OnboardingProductTypes,
 	ProfileItems,
 	TaskListType,
 } from './types';
@@ -126,7 +126,7 @@ export function* getFreeExtensions() {
 
 export function* getProductTypes() {
 	try {
-		const results: OnboardingProductType[] = yield apiFetch( {
+		const results: OnboardingProductTypes = yield apiFetch( {
 			path: WC_ADMIN_NAMESPACE + '/onboarding/product-types',
 			method: 'GET',
 		} );
diff --git a/packages/js/data/src/onboarding/selectors.ts b/packages/js/data/src/onboarding/selectors.ts
index b73c1111211..508886fbfb7 100644
--- a/packages/js/data/src/onboarding/selectors.ts
+++ b/packages/js/data/src/onboarding/selectors.ts
@@ -12,7 +12,6 @@ import {
 	OnboardingState,
 	ExtensionList,
 	ProfileItems,
-	OnboardingProductType,
 } from './types';
 import { WPDataSelectors } from '../types';
 import { Plugin } from '../plugins/types';
@@ -92,10 +91,8 @@ export const getEmailPrefill = ( state: OnboardingState ): string => {
 	return state.emailPrefill || '';
 };
 
-export const getProductTypes = (
-	state: OnboardingState
-): OnboardingProductType[] => {
-	return state.productTypes || [];
+export const getProductTypes = ( state: OnboardingState ) => {
+	return state.productTypes || {};
 };
 
 export type OnboardingSelectors = {
diff --git a/packages/js/data/src/onboarding/types.ts b/packages/js/data/src/onboarding/types.ts
index 953ecf5ce0c..217cac646b0 100644
--- a/packages/js/data/src/onboarding/types.ts
+++ b/packages/js/data/src/onboarding/types.ts
@@ -75,7 +75,7 @@ export type OnboardingState = {
 	profileItems: ProfileItems;
 	taskLists: Record< string, TaskListType >;
 	paymentMethods: Plugin[];
-	productTypes: OnboardingProductType[];
+	productTypes: OnboardingProductTypes;
 	emailPrefill: string;
 	// TODO clarify what the error record's type is
 	errors: Record< string, unknown >;
@@ -152,11 +152,21 @@ export type MethodFields = {
 };
 
 export type OnboardingProductType = {
-	default?: boolean;
 	label: string;
+	default?: boolean;
 	product?: number;
+	id?: number;
+	title?: string;
+	yearly_price?: number;
+	description?: string;
+	more_url?: string;
+	slug?: string;
 };
 
+export type OnboardingProductTypes =
+	| Record< ProductTypeSlug, OnboardingProductType >
+	| Record< string, never >;
+
 export type ExtensionList = {
 	key: string;
 	title: string;
diff --git a/packages/js/data/src/options/index.ts b/packages/js/data/src/options/index.ts
index 3b0d282f805..3af31a4fcbb 100644
--- a/packages/js/data/src/options/index.ts
+++ b/packages/js/data/src/options/index.ts
@@ -14,6 +14,7 @@ import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
 import { controls } from './controls';
 import { WPDataActions, WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -34,4 +35,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/payment-gateways/index.ts b/packages/js/data/src/payment-gateways/index.ts
index 609de07586d..b9c74e18f19 100644
--- a/packages/js/data/src/payment-gateways/index.ts
+++ b/packages/js/data/src/payment-gateways/index.ts
@@ -14,6 +14,7 @@ import * as selectors from './selectors';
 import reducer from './reducer';
 import { STORE_KEY } from './constants';
 import { WPDataActions } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 
 export const PAYMENT_GATEWAYS_STORE_NAME = STORE_KEY;
 
@@ -33,4 +34,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_KEY
 	): SelectFromMap< typeof selectors > & WPDataActions;
+	function resolveSelect(
+		key: typeof STORE_KEY
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/plugins/constants.ts b/packages/js/data/src/plugins/constants.ts
index a3949810cc2..511984b757b 100644
--- a/packages/js/data/src/plugins/constants.ts
+++ b/packages/js/data/src/plugins/constants.ts
@@ -33,7 +33,7 @@ export const pluginNames = {
 		'woocommerce'
 	),
 	'woocommerce-gateway-stripe': __( 'WooCommerce Stripe', 'woocommerce' ),
-	'woocommerce-payfast-gateway': __( 'WooCommerce PayFast', 'woocommerce' ),
+	'woocommerce-payfast-gateway': __( 'WooCommerce Payfast', 'woocommerce' ),
 	'woocommerce-payments': __( 'WooCommerce Payments', 'woocommerce' ),
 	'woocommerce-services': __( 'WooCommerce Shipping & Tax', 'woocommerce' ),
 	'woocommerce-services:shipping': __(
diff --git a/packages/js/data/src/plugins/index.ts b/packages/js/data/src/plugins/index.ts
index b209a420858..9bcc4fc6db8 100644
--- a/packages/js/data/src/plugins/index.ts
+++ b/packages/js/data/src/plugins/index.ts
@@ -13,6 +13,7 @@ import * as actions from './actions';
 import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
 import { WPDataActions, WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -33,4 +34,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/product-form/index.ts b/packages/js/data/src/product-form/index.ts
index 0a6dfbef68d..60497f202f2 100644
--- a/packages/js/data/src/product-form/index.ts
+++ b/packages/js/data/src/product-form/index.ts
@@ -14,6 +14,7 @@ import * as actions from './actions';
 import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
 import { WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -34,4 +35,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/reports/index.ts b/packages/js/data/src/reports/index.ts
index 7d738c15c78..277001992a7 100644
--- a/packages/js/data/src/reports/index.ts
+++ b/packages/js/data/src/reports/index.ts
@@ -24,6 +24,7 @@ import {
 	ReportStatObjectInfer,
 	ReportStatQueryParams,
 } from './types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -57,4 +58,7 @@ declare module '@wordpress/data' {
 		key: typeof STORE_NAME
 	): DispatchFromMap< typeof actions & WPDataActions >;
 	function select( key: typeof STORE_NAME ): ReportsSelect;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< ReportsSelect >;
 }
diff --git a/packages/js/data/src/reviews/index.ts b/packages/js/data/src/reviews/index.ts
index db73e910ab1..6a4463b57fc 100644
--- a/packages/js/data/src/reviews/index.ts
+++ b/packages/js/data/src/reviews/index.ts
@@ -16,6 +16,7 @@ import * as resolvers from './resolvers';
 import controls from '../controls';
 import reducer, { State } from './reducer';
 import { WPDataActions, WPDataSelectors } from '../types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 
 export * from './types';
 export type { State };
@@ -39,4 +40,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< ReviewSelector >;
 }
diff --git a/packages/js/data/src/settings/index.ts b/packages/js/data/src/settings/index.ts
index cd21446c45c..d370aaef0bd 100644
--- a/packages/js/data/src/settings/index.ts
+++ b/packages/js/data/src/settings/index.ts
@@ -17,6 +17,7 @@ import * as actions from './actions';
 import * as resolvers from './resolvers';
 import reducer, { State } from './reducer';
 import { SettingsState } from './types';
+import { PromiseifySelectors } from '../types/promiseify-selectors';
 export * from './types';
 export type { State };
 
@@ -37,4 +38,7 @@ declare module '@wordpress/data' {
 	function select(
 		key: typeof STORE_NAME
 	): SelectFromMap< typeof selectors > & WPDataSelectors;
+	function resolveSelect(
+		key: typeof STORE_NAME
+	): PromiseifySelectors< SelectFromMap< typeof selectors > >;
 }
diff --git a/packages/js/data/src/types/promiseify-selectors.ts b/packages/js/data/src/types/promiseify-selectors.ts
new file mode 100644
index 00000000000..fc81e2d2734
--- /dev/null
+++ b/packages/js/data/src/types/promiseify-selectors.ts
@@ -0,0 +1,13 @@
+/**
+ * Type helper that maps select() return types to their resolveSelect() return types.
+ * This works by mapping over each Selector, and returning a function that
+ * returns a Promise of the Selector's return type.
+ */
+
+export type PromiseifySelectors< Selectors > = {
+	[ SelectorFunction in keyof Selectors ]: Selectors[ SelectorFunction ] extends (
+		...args: infer SelectorArgs
+	) => infer SelectorReturnType
+		? ( ...args: SelectorArgs ) => Promise< SelectorReturnType >
+		: never;
+};
diff --git a/packages/js/experimental/changelog/fix-37502 b/packages/js/experimental/changelog/fix-37502
new file mode 100644
index 00000000000..115429c4b01
--- /dev/null
+++ b/packages/js/experimental/changelog/fix-37502
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Correct spelling errors
diff --git a/packages/js/experimental/src/experimental-list/test/index.tsx b/packages/js/experimental/src/experimental-list/test/index.tsx
index c37e714bc76..89e8f6889a7 100644
--- a/packages/js/experimental/src/experimental-list/test/index.tsx
+++ b/packages/js/experimental/src/experimental-list/test/index.tsx
@@ -163,7 +163,7 @@ describe( 'Experimental List', () => {
 	} );
 
 	describe( 'ExperimentalListItemCollapse', () => {
-		it( 'should not render its children intially, but an extra list footer with show text', () => {
+		it( 'should not render its children initially, but an extra list footer with show text', () => {
 			const { container } = render(
 				<ExperimentalCollapsibleList
 					collapseLabel="Show less"
diff --git a/packages/js/experimental/src/inbox-note/test/inbox-note.tsx b/packages/js/experimental/src/inbox-note/test/inbox-note.tsx
index bbe03171804..4f8dbb61273 100644
--- a/packages/js/experimental/src/inbox-note/test/inbox-note.tsx
+++ b/packages/js/experimental/src/inbox-note/test/inbox-note.tsx
@@ -185,7 +185,7 @@ describe( 'InboxNoteCard', () => {
 			);
 		} );
 
-		it( 'should call onVisible when visiblity sensor calls it', () => {
+		it( 'should call onVisible when visibility sensor calls it', () => {
 			const onVisible = jest.fn();
 			const { getByText } = render(
 				<InboxNoteCard
@@ -199,7 +199,7 @@ describe( 'InboxNoteCard', () => {
 			expect( onVisible ).toHaveBeenCalledWith( note );
 		} );
 
-		it( 'should call onVisible when visiblity sensor calls it, but only once', () => {
+		it( 'should call onVisible when visibility sensor calls it, but only once', () => {
 			const onVisible = jest.fn();
 			const { getByText } = render(
 				<InboxNoteCard
diff --git a/packages/js/internal-js-tests/jest-preset.js b/packages/js/internal-js-tests/jest-preset.js
index 37fe98e6e6d..4868cdfbcda 100644
--- a/packages/js/internal-js-tests/jest-preset.js
+++ b/packages/js/internal-js-tests/jest-preset.js
@@ -10,6 +10,10 @@ module.exports = {
 			__dirname,
 			'build/mocks/woocommerce-settings'
 		),
+		'@woocommerce/tracks': path.resolve(
+			__dirname,
+			'build/mocks/woocommerce-tracks'
+		),
 		'~/(.*)': path.resolve(
 			__dirname,
 			'../../../plugins/woocommerce-admin/client/$1'
diff --git a/packages/js/internal-js-tests/src/mocks/woocommerce-tracks.js b/packages/js/internal-js-tests/src/mocks/woocommerce-tracks.js
new file mode 100644
index 00000000000..e85d0c75be2
--- /dev/null
+++ b/packages/js/internal-js-tests/src/mocks/woocommerce-tracks.js
@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+	recordEvent: jest.fn(),
+	recordPageView: jest.fn(),
+};
diff --git a/packages/js/internal-js-tests/src/setup-globals.js b/packages/js/internal-js-tests/src/setup-globals.js
index 68686994952..e2b1469fa8a 100644
--- a/packages/js/internal-js-tests/src/setup-globals.js
+++ b/packages/js/internal-js-tests/src/setup-globals.js
@@ -5,6 +5,10 @@ import { setLocaleData } from '@wordpress/i18n';
 import { registerStore } from '@wordpress/data';
 import 'regenerator-runtime/runtime';
 
+// Mock the config module to avoid errors like:
+// Core Error: Could not find config value for key ${ key }. Please make sure that if you need it then it has a default value assigned in config/_shared.json.
+jest.mock( '@automattic/calypso-config' );
+
 // Due to the dependency @wordpress/compose which introduces the use of
 // ResizeObserver this global mock is required for some tests to work.
 global.ResizeObserver = require( 'resize-observer-polyfill' );
diff --git a/packages/js/onboarding/changelog/dev-move-geolocation-utils b/packages/js/onboarding/changelog/dev-move-geolocation-utils
new file mode 100644
index 00000000000..b032a803c1e
--- /dev/null
+++ b/packages/js/onboarding/changelog/dev-move-geolocation-utils
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Moved geolocation country matching functions to @woocommerce/onboarding
\ No newline at end of file
diff --git a/packages/js/onboarding/jest.config.json b/packages/js/onboarding/jest.config.json
new file mode 100644
index 00000000000..3d8108048f6
--- /dev/null
+++ b/packages/js/onboarding/jest.config.json
@@ -0,0 +1,4 @@
+{
+	"rootDir": "./src",
+	"preset": "../node_modules/@woocommerce/internal-js-tests/jest-preset.js"
+}
diff --git a/packages/js/onboarding/package.json b/packages/js/onboarding/package.json
index 10b3e1b1e0e..4907d751d76 100644
--- a/packages/js/onboarding/package.json
+++ b/packages/js/onboarding/package.json
@@ -37,14 +37,19 @@
 		"@wordpress/components": "wp-6.0",
 		"@wordpress/element": "wp-6.0",
 		"@wordpress/i18n": "wp-6.0",
+		"string-similarity": "4.0.4",
 		"gridicons": "^3.4.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.17.5",
+		"@testing-library/react": "^12.1.3",
+		"@types/string-similarity" : "4.0.0",
 		"@types/wordpress__components": "^19.10.3",
 		"@types/wordpress__data": "^6.0.0",
+		"@types/jest": "^27.4.1",
 		"@woocommerce/eslint-plugin": "workspace:*",
 		"@woocommerce/internal-style-build": "workspace:*",
+		"@woocommerce/internal-js-tests": "workspace:*",
 		"@wordpress/browserslist-config": "wp-6.0",
 		"css-loader": "^3.6.0",
 		"eslint": "^8.32.0",
@@ -62,6 +67,7 @@
 	},
 	"scripts": {
 		"turbo:build": "pnpm run build:js && pnpm run build:css",
+		"turbo:test": "jest --config ./jest.config.json",
 		"prepare": "composer install",
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
@@ -70,12 +76,15 @@
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\" \"webpack --watch\"",
+		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"prepack": "pnpm run clean && pnpm run build",
-		"lint:fix": "eslint src --fix"
+		"lint:fix": "eslint src --fix",
+		"test-staged": "jest --bail --config ./jest.config.json --findRelatedTests"
 	},
 	"lint-staged": {
 		"*.(t|j)s?(x)": [
-			"pnpm lint:fix"
+			"pnpm lint:fix",
+			"pnpm test-staged"
 		]
 	}
 }
diff --git a/packages/js/onboarding/src/index.ts b/packages/js/onboarding/src/index.ts
index 526c2f1859e..e0c973a7e83 100644
--- a/packages/js/onboarding/src/index.ts
+++ b/packages/js/onboarding/src/index.ts
@@ -15,3 +15,4 @@ export { WooPaymentGatewayConfigure } from './components/WooPaymentGatewayConfig
 export { WooOnboardingTaskListItem } from './components/WooOnboardingTaskListItem';
 export { WooOnboardingTaskListHeader } from './components/WooOnboardingTaskListHeader';
 export { WooOnboardingTask } from './components/WooOnboardingTask';
+export * from './utils/countries';
diff --git a/packages/js/onboarding/src/utils/countries/index.ts b/packages/js/onboarding/src/utils/countries/index.ts
new file mode 100644
index 00000000000..387b0ee6d95
--- /dev/null
+++ b/packages/js/onboarding/src/utils/countries/index.ts
@@ -0,0 +1,79 @@
+/**
+ * External dependencies
+ */
+import stringSimilarity from 'string-similarity';
+
+/**
+ * Internal dependencies
+ */
+import { getMappingRegion } from './location-mapping';
+
+/**
+ * Country state option.
+ */
+export type CountryStateOption = {
+	key: string;
+	label: string;
+};
+
+export type Location = {
+	country_short?: string;
+	region?: string;
+	city?: string;
+};
+
+/**
+ * Returns a country option for the given location.
+ */
+export const findCountryOption = (
+	countryStateOptions: CountryStateOption[],
+	location: Location | undefined,
+	minimumSimilarity = 0.7
+) => {
+	if ( ! location ) {
+		return null;
+	}
+
+	let match = null;
+	let matchSimilarity = minimumSimilarity;
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return -- don't want to put this inside the loop
+	const mappingRegion = getMappingRegion( location );
+
+	for ( const option of countryStateOptions ) {
+		// Country matches exactly.
+		if ( option.key === location.country_short ) {
+			return option;
+		}
+
+		// Countries have regions such as 'US:CA'.
+		const countryCode = option.key.split( ':' )[ 0 ];
+		if (
+			countryCode === location.country_short &&
+			option.label.includes( '—' )
+		) {
+			const wcRegion = option.label.split( '—' )[ 1 ].trim();
+
+			// Region matches exactly with mapping.
+			if ( mappingRegion === wcRegion ) {
+				return option;
+			}
+
+			// Find the region with the highest similarity.
+			const similarity = Math.max(
+				stringSimilarity.compareTwoStrings(
+					wcRegion,
+					location.region || ''
+				),
+				stringSimilarity.compareTwoStrings(
+					wcRegion,
+					location.city || ''
+				)
+			);
+			if ( similarity >= matchSimilarity ) {
+				match = option;
+				matchSimilarity = similarity;
+			}
+		}
+	}
+	return match;
+};
diff --git a/packages/js/onboarding/src/utils/countries/location-mapping.ts b/packages/js/onboarding/src/utils/countries/location-mapping.ts
new file mode 100644
index 00000000000..dce03dce1b4
--- /dev/null
+++ b/packages/js/onboarding/src/utils/countries/location-mapping.ts
@@ -0,0 +1,58 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { Location } from '.';
+
+/**
+ * This file is used to map a location to a WC region label
+ * so that we can find the correct country option
+ * since WPCOM geolocation returns a different
+ * region or city name.
+ */
+
+// Key is the country code, value is an object with keys as region/city names and values as WC region labels.
+const MAPPING: Record< string, Record< string, string > > = {
+	PH: {
+		'National Capital Region': __( 'Metro Manila', 'woocommerce' ),
+	},
+	IT: {
+		Rome: __( 'Roma', 'woocommerce' ),
+	},
+};
+
+/**
+ * Returns a WC mapping region name for the given country, region and city.
+ */
+export const getMappingRegion = ( {
+	country_short: countryCode,
+	region = '',
+	city = '',
+}: Location ) => {
+	if ( ! countryCode ) {
+		return null;
+	}
+
+	const countryMapping = MAPPING[ countryCode ];
+	if ( ! countryMapping ) {
+		return null;
+	}
+
+	const regionMapping = countryMapping[ region ];
+	if ( regionMapping ) {
+		return regionMapping;
+	}
+
+	const cityMapping = countryMapping[ city ];
+	if ( cityMapping ) {
+		return cityMapping;
+	}
+
+	return null;
+};
+
+export default MAPPING;
diff --git a/packages/js/onboarding/src/utils/countries/tests/utils/country-options.ts b/packages/js/onboarding/src/utils/countries/tests/utils/country-options.ts
new file mode 100644
index 00000000000..36fd8d9c256
--- /dev/null
+++ b/packages/js/onboarding/src/utils/countries/tests/utils/country-options.ts
@@ -0,0 +1,8390 @@
+export const countryStateOptions = [
+	{
+		key: 'AF',
+		label: 'Afghanistan',
+	},
+	{
+		key: 'AX',
+		label: 'Åland Islands',
+	},
+	{
+		key: 'AL:AL-01',
+		label: 'Albania — Berat',
+	},
+	{
+		key: 'AL:AL-09',
+		label: 'Albania — Dibër',
+	},
+	{
+		key: 'AL:AL-02',
+		label: 'Albania — Durrës',
+	},
+	{
+		key: 'AL:AL-03',
+		label: 'Albania — Elbasan',
+	},
+	{
+		key: 'AL:AL-04',
+		label: 'Albania — Fier',
+	},
+	{
+		key: 'AL:AL-05',
+		label: 'Albania — Gjirokastër',
+	},
+	{
+		key: 'AL:AL-06',
+		label: 'Albania — Korçë',
+	},
+	{
+		key: 'AL:AL-07',
+		label: 'Albania — Kukës',
+	},
+	{
+		key: 'AL:AL-08',
+		label: 'Albania — Lezhë',
+	},
+	{
+		key: 'AL:AL-10',
+		label: 'Albania — Shkodër',
+	},
+	{
+		key: 'AL:AL-11',
+		label: 'Albania — Tirana',
+	},
+	{
+		key: 'AL:AL-12',
+		label: 'Albania — Vlorë',
+	},
+	{
+		key: 'DZ:DZ-01',
+		label: 'Algeria — Adrar',
+	},
+	{
+		key: 'DZ:DZ-02',
+		label: 'Algeria — Chlef',
+	},
+	{
+		key: 'DZ:DZ-03',
+		label: 'Algeria — Laghouat',
+	},
+	{
+		key: 'DZ:DZ-04',
+		label: 'Algeria — Oum El Bouaghi',
+	},
+	{
+		key: 'DZ:DZ-05',
+		label: 'Algeria — Batna',
+	},
+	{
+		key: 'DZ:DZ-06',
+		label: 'Algeria — Béjaïa',
+	},
+	{
+		key: 'DZ:DZ-07',
+		label: 'Algeria — Biskra',
+	},
+	{
+		key: 'DZ:DZ-08',
+		label: 'Algeria — Béchar',
+	},
+	{
+		key: 'DZ:DZ-09',
+		label: 'Algeria — Blida',
+	},
+	{
+		key: 'DZ:DZ-10',
+		label: 'Algeria — Bouira',
+	},
+	{
+		key: 'DZ:DZ-11',
+		label: 'Algeria — Tamanghasset',
+	},
+	{
+		key: 'DZ:DZ-12',
+		label: 'Algeria — Tébessa',
+	},
+	{
+		key: 'DZ:DZ-13',
+		label: 'Algeria — Tlemcen',
+	},
+	{
+		key: 'DZ:DZ-14',
+		label: 'Algeria — Tiaret',
+	},
+	{
+		key: 'DZ:DZ-15',
+		label: 'Algeria — Tizi Ouzou',
+	},
+	{
+		key: 'DZ:DZ-16',
+		label: 'Algeria — Algiers',
+	},
+	{
+		key: 'DZ:DZ-17',
+		label: 'Algeria — Djelfa',
+	},
+	{
+		key: 'DZ:DZ-18',
+		label: 'Algeria — Jijel',
+	},
+	{
+		key: 'DZ:DZ-19',
+		label: 'Algeria — Sétif',
+	},
+	{
+		key: 'DZ:DZ-20',
+		label: 'Algeria — Saïda',
+	},
+	{
+		key: 'DZ:DZ-21',
+		label: 'Algeria — Skikda',
+	},
+	{
+		key: 'DZ:DZ-22',
+		label: 'Algeria — Sidi Bel Abbès',
+	},
+	{
+		key: 'DZ:DZ-23',
+		label: 'Algeria — Annaba',
+	},
+	{
+		key: 'DZ:DZ-24',
+		label: 'Algeria — Guelma',
+	},
+	{
+		key: 'DZ:DZ-25',
+		label: 'Algeria — Constantine',
+	},
+	{
+		key: 'DZ:DZ-26',
+		label: 'Algeria — Médéa',
+	},
+	{
+		key: 'DZ:DZ-27',
+		label: 'Algeria — Mostaganem',
+	},
+	{
+		key: 'DZ:DZ-28',
+		label: 'Algeria — M’Sila',
+	},
+	{
+		key: 'DZ:DZ-29',
+		label: 'Algeria — Mascara',
+	},
+	{
+		key: 'DZ:DZ-30',
+		label: 'Algeria — Ouargla',
+	},
+	{
+		key: 'DZ:DZ-31',
+		label: 'Algeria — Oran',
+	},
+	{
+		key: 'DZ:DZ-32',
+		label: 'Algeria — El Bayadh',
+	},
+	{
+		key: 'DZ:DZ-33',
+		label: 'Algeria — Illizi',
+	},
+	{
+		key: 'DZ:DZ-34',
+		label: 'Algeria — Bordj Bou Arréridj',
+	},
+	{
+		key: 'DZ:DZ-35',
+		label: 'Algeria — Boumerdès',
+	},
+	{
+		key: 'DZ:DZ-36',
+		label: 'Algeria — El Tarf',
+	},
+	{
+		key: 'DZ:DZ-37',
+		label: 'Algeria — Tindouf',
+	},
+	{
+		key: 'DZ:DZ-38',
+		label: 'Algeria — Tissemsilt',
+	},
+	{
+		key: 'DZ:DZ-39',
+		label: 'Algeria — El Oued',
+	},
+	{
+		key: 'DZ:DZ-40',
+		label: 'Algeria — Khenchela',
+	},
+	{
+		key: 'DZ:DZ-41',
+		label: 'Algeria — Souk Ahras',
+	},
+	{
+		key: 'DZ:DZ-42',
+		label: 'Algeria — Tipasa',
+	},
+	{
+		key: 'DZ:DZ-43',
+		label: 'Algeria — Mila',
+	},
+	{
+		key: 'DZ:DZ-44',
+		label: 'Algeria — Aïn Defla',
+	},
+	{
+		key: 'DZ:DZ-45',
+		label: 'Algeria — Naama',
+	},
+	{
+		key: 'DZ:DZ-46',
+		label: 'Algeria — Aïn Témouchent',
+	},
+	{
+		key: 'DZ:DZ-47',
+		label: 'Algeria — Ghardaïa',
+	},
+	{
+		key: 'DZ:DZ-48',
+		label: 'Algeria — Relizane',
+	},
+	{
+		key: 'AS',
+		label: 'American Samoa',
+	},
+	{
+		key: 'AD',
+		label: 'Andorra',
+	},
+	{
+		key: 'AO:BGO',
+		label: 'Angola — Bengo',
+	},
+	{
+		key: 'AO:BLU',
+		label: 'Angola — Benguela',
+	},
+	{
+		key: 'AO:BIE',
+		label: 'Angola — Bié',
+	},
+	{
+		key: 'AO:CAB',
+		label: 'Angola — Cabinda',
+	},
+	{
+		key: 'AO:CNN',
+		label: 'Angola — Cunene',
+	},
+	{
+		key: 'AO:HUA',
+		label: 'Angola — Huambo',
+	},
+	{
+		key: 'AO:HUI',
+		label: 'Angola — Huíla',
+	},
+	{
+		key: 'AO:CCU',
+		label: 'Angola — Kuando Kubango',
+	},
+	{
+		key: 'AO:CNO',
+		label: 'Angola — Kwanza-Norte',
+	},
+	{
+		key: 'AO:CUS',
+		label: 'Angola — Kwanza-Sul',
+	},
+	{
+		key: 'AO:LUA',
+		label: 'Angola — Luanda',
+	},
+	{
+		key: 'AO:LNO',
+		label: 'Angola — Lunda-Norte',
+	},
+	{
+		key: 'AO:LSU',
+		label: 'Angola — Lunda-Sul',
+	},
+	{
+		key: 'AO:MAL',
+		label: 'Angola — Malanje',
+	},
+	{
+		key: 'AO:MOX',
+		label: 'AngolaSevastopol — Moxico',
+	},
+	{
+		key: 'AO:NAM',
+		label: 'Angola — Namibe',
+	},
+	{
+		key: 'AO:UIG',
+		label: 'Angola — Uíge',
+	},
+	{
+		key: 'AO:ZAI',
+		label: 'Angola — Zaire',
+	},
+	{
+		key: 'AI',
+		label: 'Anguilla',
+	},
+	{
+		key: 'AQ',
+		label: 'Antarctica',
+	},
+	{
+		key: 'AG',
+		label: 'Antigua and Barbuda',
+	},
+	{
+		key: 'AR:C',
+		label: 'Argentina — Ciudad Autónoma de Buenos Aires',
+	},
+	{
+		key: 'AR:B',
+		label: 'Argentina — Buenos Aires',
+	},
+	{
+		key: 'AR:K',
+		label: 'Argentina — Catamarca',
+	},
+	{
+		key: 'AR:H',
+		label: 'Argentina — Chaco',
+	},
+	{
+		key: 'AR:U',
+		label: 'Argentina — Chubut',
+	},
+	{
+		key: 'AR:X',
+		label: 'Argentina — Córdoba',
+	},
+	{
+		key: 'AR:W',
+		label: 'Argentina — Corrientes',
+	},
+	{
+		key: 'AR:E',
+		label: 'Argentina — Entre Ríos',
+	},
+	{
+		key: 'AR:P',
+		label: 'Argentina — Formosa',
+	},
+	{
+		key: 'AR:Y',
+		label: 'Argentina — Jujuy',
+	},
+	{
+		key: 'AR:L',
+		label: 'Argentina — La Pampa',
+	},
+	{
+		key: 'AR:F',
+		label: 'Argentina — La Rioja',
+	},
+	{
+		key: 'AR:M',
+		label: 'Argentina — Mendoza',
+	},
+	{
+		key: 'AR:N',
+		label: 'Argentina — Misiones',
+	},
+	{
+		key: 'AR:Q',
+		label: 'Argentina — Neuquén',
+	},
+	{
+		key: 'AR:R',
+		label: 'Argentina — Río Negro',
+	},
+	{
+		key: 'AR:A',
+		label: 'Argentina — Salta',
+	},
+	{
+		key: 'AR:J',
+		label: 'Argentina — San Juan',
+	},
+	{
+		key: 'AR:D',
+		label: 'Argentina — San Luis',
+	},
+	{
+		key: 'AR:Z',
+		label: 'Argentina — Santa Cruz',
+	},
+	{
+		key: 'AR:S',
+		label: 'Argentina — Santa Fe',
+	},
+	{
+		key: 'AR:G',
+		label: 'Argentina — Santiago del Estero',
+	},
+	{
+		key: 'AR:V',
+		label: 'Argentina — Tierra del Fuego',
+	},
+	{
+		key: 'AR:T',
+		label: 'Argentina — Tucumán',
+	},
+	{
+		key: 'AM',
+		label: 'Armenia',
+	},
+	{
+		key: 'AW',
+		label: 'Aruba',
+	},
+	{
+		key: 'AU:ACT',
+		label: 'Australia — Australian Capital Territory',
+	},
+	{
+		key: 'AU:NSW',
+		label: 'Australia — New South Wales',
+	},
+	{
+		key: 'AU:NT',
+		label: 'Australia — Northern Territory',
+	},
+	{
+		key: 'AU:QLD',
+		label: 'Australia — Queensland',
+	},
+	{
+		key: 'AU:SA',
+		label: 'Australia — South Australia',
+	},
+	{
+		key: 'AU:TAS',
+		label: 'Australia — Tasmania',
+	},
+	{
+		key: 'AU:VIC',
+		label: 'Australia — Victoria',
+	},
+	{
+		key: 'AU:WA',
+		label: 'Australia — Western Australia',
+	},
+	{
+		key: 'AT',
+		label: 'Austria',
+	},
+	{
+		key: 'AZ',
+		label: 'Azerbaijan',
+	},
+	{
+		key: 'BS',
+		label: 'Bahamas',
+	},
+	{
+		key: 'BH',
+		label: 'Bahrain',
+	},
+	{
+		key: 'BD:BD-05',
+		label: 'Bangladesh — Bagerhat',
+	},
+	{
+		key: 'BD:BD-01',
+		label: 'Bangladesh — Bandarban',
+	},
+	{
+		key: 'BD:BD-02',
+		label: 'Bangladesh — Barguna',
+	},
+	{
+		key: 'BD:BD-06',
+		label: 'Bangladesh — Barishal',
+	},
+	{
+		key: 'BD:BD-07',
+		label: 'Bangladesh — Bhola',
+	},
+	{
+		key: 'BD:BD-03',
+		label: 'Bangladesh — Bogura',
+	},
+	{
+		key: 'BD:BD-04',
+		label: 'Bangladesh — Brahmanbaria',
+	},
+	{
+		key: 'BD:BD-09',
+		label: 'Bangladesh — Chandpur',
+	},
+	{
+		key: 'BD:BD-10',
+		label: 'Bangladesh — Chattogram',
+	},
+	{
+		key: 'BD:BD-12',
+		label: 'Bangladesh — Chuadanga',
+	},
+	{
+		key: 'BD:BD-11',
+		label: "Bangladesh — Cox's Bazar",
+	},
+	{
+		key: 'BD:BD-08',
+		label: 'Bangladesh — Cumilla',
+	},
+	{
+		key: 'BD:BD-13',
+		label: 'Bangladesh — Dhaka',
+	},
+	{
+		key: 'BD:BD-14',
+		label: 'Bangladesh — Dinajpur',
+	},
+	{
+		key: 'BD:BD-15',
+		label: 'Bangladesh — Faridpur ',
+	},
+	{
+		key: 'BD:BD-16',
+		label: 'Bangladesh — Feni',
+	},
+	{
+		key: 'BD:BD-19',
+		label: 'Bangladesh — Gaibandha',
+	},
+	{
+		key: 'BD:BD-18',
+		label: 'Bangladesh — Gazipur',
+	},
+	{
+		key: 'BD:BD-17',
+		label: 'Bangladesh — Gopalganj',
+	},
+	{
+		key: 'BD:BD-20',
+		label: 'Bangladesh — Habiganj',
+	},
+	{
+		key: 'BD:BD-21',
+		label: 'Bangladesh — Jamalpur',
+	},
+	{
+		key: 'BD:BD-22',
+		label: 'Bangladesh — Jashore',
+	},
+	{
+		key: 'BD:BD-25',
+		label: 'Bangladesh — Jhalokati',
+	},
+	{
+		key: 'BD:BD-23',
+		label: 'Bangladesh — Jhenaidah',
+	},
+	{
+		key: 'BD:BD-24',
+		label: 'Bangladesh — Joypurhat',
+	},
+	{
+		key: 'BD:BD-29',
+		label: 'Bangladesh — Khagrachhari',
+	},
+	{
+		key: 'BD:BD-27',
+		label: 'Bangladesh — Khulna',
+	},
+	{
+		key: 'BD:BD-26',
+		label: 'Bangladesh — Kishoreganj',
+	},
+	{
+		key: 'BD:BD-28',
+		label: 'Bangladesh — Kurigram',
+	},
+	{
+		key: 'BD:BD-30',
+		label: 'Bangladesh — Kushtia',
+	},
+	{
+		key: 'BD:BD-31',
+		label: 'Bangladesh — Lakshmipur',
+	},
+	{
+		key: 'BD:BD-32',
+		label: 'Bangladesh — Lalmonirhat',
+	},
+	{
+		key: 'BD:BD-36',
+		label: 'Bangladesh — Madaripur',
+	},
+	{
+		key: 'BD:BD-37',
+		label: 'Bangladesh — Magura',
+	},
+	{
+		key: 'BD:BD-33',
+		label: 'Bangladesh — Manikganj ',
+	},
+	{
+		key: 'BD:BD-39',
+		label: 'Bangladesh — Meherpur',
+	},
+	{
+		key: 'BD:BD-38',
+		label: 'Bangladesh — Moulvibazar',
+	},
+	{
+		key: 'BD:BD-35',
+		label: 'Bangladesh — Munshiganj',
+	},
+	{
+		key: 'BD:BD-34',
+		label: 'Bangladesh — Mymensingh',
+	},
+	{
+		key: 'BD:BD-48',
+		label: 'Bangladesh — Naogaon',
+	},
+	{
+		key: 'BD:BD-43',
+		label: 'Bangladesh — Narail',
+	},
+	{
+		key: 'BD:BD-40',
+		label: 'Bangladesh — Narayanganj',
+	},
+	{
+		key: 'BD:BD-42',
+		label: 'Bangladesh — Narsingdi',
+	},
+	{
+		key: 'BD:BD-44',
+		label: 'Bangladesh — Natore',
+	},
+	{
+		key: 'BD:BD-45',
+		label: 'Bangladesh — Nawabganj',
+	},
+	{
+		key: 'BD:BD-41',
+		label: 'Bangladesh — Netrakona',
+	},
+	{
+		key: 'BD:BD-46',
+		label: 'Bangladesh — Nilphamari',
+	},
+	{
+		key: 'BD:BD-47',
+		label: 'Bangladesh — Noakhali',
+	},
+	{
+		key: 'BD:BD-49',
+		label: 'Bangladesh — Pabna',
+	},
+	{
+		key: 'BD:BD-52',
+		label: 'Bangladesh — Panchagarh',
+	},
+	{
+		key: 'BD:BD-51',
+		label: 'Bangladesh — Patuakhali',
+	},
+	{
+		key: 'BD:BD-50',
+		label: 'Bangladesh — Pirojpur',
+	},
+	{
+		key: 'BD:BD-53',
+		label: 'Bangladesh — Rajbari',
+	},
+	{
+		key: 'BD:BD-54',
+		label: 'Bangladesh — Rajshahi',
+	},
+	{
+		key: 'BD:BD-56',
+		label: 'Bangladesh — Rangamati',
+	},
+	{
+		key: 'BD:BD-55',
+		label: 'Bangladesh — Rangpur',
+	},
+	{
+		key: 'BD:BD-58',
+		label: 'Bangladesh — Satkhira',
+	},
+	{
+		key: 'BD:BD-62',
+		label: 'Bangladesh — Shariatpur',
+	},
+	{
+		key: 'BD:BD-57',
+		label: 'Bangladesh — Sherpur',
+	},
+	{
+		key: 'BD:BD-59',
+		label: 'Bangladesh — Sirajganj',
+	},
+	{
+		key: 'BD:BD-61',
+		label: 'Bangladesh — Sunamganj',
+	},
+	{
+		key: 'BD:BD-60',
+		label: 'Bangladesh — Sylhet',
+	},
+	{
+		key: 'BD:BD-63',
+		label: 'Bangladesh — Tangail',
+	},
+	{
+		key: 'BD:BD-64',
+		label: 'Bangladesh — Thakurgaon',
+	},
+	{
+		key: 'BB',
+		label: 'Barbados',
+	},
+	{
+		key: 'BY',
+		label: 'Belarus',
+	},
+	{
+		key: 'PW',
+		label: 'Belau',
+	},
+	{
+		key: 'BE',
+		label: 'Belgium',
+	},
+	{
+		key: 'BZ',
+		label: 'Belize',
+	},
+	{
+		key: 'BJ:AL',
+		label: 'Benin — Alibori',
+	},
+	{
+		key: 'BJ:AK',
+		label: 'Benin — Atakora',
+	},
+	{
+		key: 'BJ:AQ',
+		label: 'Benin — Atlantique',
+	},
+	{
+		key: 'BJ:BO',
+		label: 'Benin — Borgou',
+	},
+	{
+		key: 'BJ:CO',
+		label: 'Benin — Collines',
+	},
+	{
+		key: 'BJ:KO',
+		label: 'Benin — Kouffo',
+	},
+	{
+		key: 'BJ:DO',
+		label: 'Benin — Donga',
+	},
+	{
+		key: 'BJ:LI',
+		label: 'Benin — Littoral',
+	},
+	{
+		key: 'BJ:MO',
+		label: 'Benin — Mono',
+	},
+	{
+		key: 'BJ:OU',
+		label: 'Benin — Ouémé',
+	},
+	{
+		key: 'BJ:PL',
+		label: 'Benin — Plateau',
+	},
+	{
+		key: 'BJ:ZO',
+		label: 'Benin — Zou',
+	},
+	{
+		key: 'BM',
+		label: 'Bermuda',
+	},
+	{
+		key: 'BT',
+		label: 'Bhutan',
+	},
+	{
+		key: 'BO:BO-B',
+		label: 'Bolivia — Beni',
+	},
+	{
+		key: 'BO:BO-H',
+		label: 'Bolivia — Chuquisaca',
+	},
+	{
+		key: 'BO:BO-C',
+		label: 'Bolivia — Cochabamba',
+	},
+	{
+		key: 'BO:BO-L',
+		label: 'Bolivia — La Paz',
+	},
+	{
+		key: 'BO:BO-O',
+		label: 'Bolivia — Oruro',
+	},
+	{
+		key: 'BO:BO-N',
+		label: 'Bolivia — Pando',
+	},
+	{
+		key: 'BO:BO-P',
+		label: 'Bolivia — Potosí',
+	},
+	{
+		key: 'BO:BO-S',
+		label: 'Bolivia — Santa Cruz',
+	},
+	{
+		key: 'BO:BO-T',
+		label: 'Bolivia — Tarija',
+	},
+	{
+		key: 'BQ',
+		label: 'Bonaire, Saint Eustatius and Saba',
+	},
+	{
+		key: 'BA',
+		label: 'Bosnia and Herzegovina',
+	},
+	{
+		key: 'BW',
+		label: 'Botswana',
+	},
+	{
+		key: 'BV',
+		label: 'Bouvet Island',
+	},
+	{
+		key: 'BR:AC',
+		label: 'Brazil — Acre',
+	},
+	{
+		key: 'BR:AL',
+		label: 'Brazil — Alagoas',
+	},
+	{
+		key: 'BR:AP',
+		label: 'Brazil — Amapá',
+	},
+	{
+		key: 'BR:AM',
+		label: 'Brazil — Amazonas',
+	},
+	{
+		key: 'BR:BA',
+		label: 'Brazil — Bahia',
+	},
+	{
+		key: 'BR:CE',
+		label: 'Brazil — Ceará',
+	},
+	{
+		key: 'BR:DF',
+		label: 'Brazil — Distrito Federal',
+	},
+	{
+		key: 'BR:ES',
+		label: 'Brazil — Espírito Santo',
+	},
+	{
+		key: 'BR:GO',
+		label: 'Brazil — Goiás',
+	},
+	{
+		key: 'BR:MA',
+		label: 'Brazil — Maranhão',
+	},
+	{
+		key: 'BR:MT',
+		label: 'Brazil — Mato Grosso',
+	},
+	{
+		key: 'BR:MS',
+		label: 'Brazil — Mato Grosso do Sul',
+	},
+	{
+		key: 'BR:MG',
+		label: 'Brazil — Minas Gerais',
+	},
+	{
+		key: 'BR:PA',
+		label: 'Brazil — Pará',
+	},
+	{
+		key: 'BR:PB',
+		label: 'Brazil — Paraíba',
+	},
+	{
+		key: 'BR:PR',
+		label: 'Brazil — Paraná',
+	},
+	{
+		key: 'BR:PE',
+		label: 'Brazil — Pernambuco',
+	},
+	{
+		key: 'BR:PI',
+		label: 'Brazil — Piauí',
+	},
+	{
+		key: 'BR:RJ',
+		label: 'Brazil — Rio de Janeiro',
+	},
+	{
+		key: 'BR:RN',
+		label: 'Brazil — Rio Grande do Norte',
+	},
+	{
+		key: 'BR:RS',
+		label: 'Brazil — Rio Grande do Sul',
+	},
+	{
+		key: 'BR:RO',
+		label: 'Brazil — Rondônia',
+	},
+	{
+		key: 'BR:RR',
+		label: 'Brazil — Roraima',
+	},
+	{
+		key: 'BR:SC',
+		label: 'Brazil — Santa Catarina',
+	},
+	{
+		key: 'BR:SP',
+		label: 'Brazil — São Paulo',
+	},
+	{
+		key: 'BR:SE',
+		label: 'Brazil — Sergipe',
+	},
+	{
+		key: 'BR:TO',
+		label: 'Brazil — Tocantins',
+	},
+	{
+		key: 'IO',
+		label: 'British Indian Ocean Territory',
+	},
+	{
+		key: 'BN',
+		label: 'Brunei',
+	},
+	{
+		key: 'BG:BG-01',
+		label: 'Bulgaria — Blagoevgrad',
+	},
+	{
+		key: 'BG:BG-02',
+		label: 'Bulgaria — Burgas',
+	},
+	{
+		key: 'BG:BG-08',
+		label: 'Bulgaria — Dobrich',
+	},
+	{
+		key: 'BG:BG-07',
+		label: 'Bulgaria — Gabrovo',
+	},
+	{
+		key: 'BG:BG-26',
+		label: 'Bulgaria — Haskovo',
+	},
+	{
+		key: 'BG:BG-09',
+		label: 'Bulgaria — Kardzhali',
+	},
+	{
+		key: 'BG:BG-10',
+		label: 'Bulgaria — Kyustendil',
+	},
+	{
+		key: 'BG:BG-11',
+		label: 'Bulgaria — Lovech',
+	},
+	{
+		key: 'BG:BG-12',
+		label: 'Bulgaria — Montana',
+	},
+	{
+		key: 'BG:BG-13',
+		label: 'Bulgaria — Pazardzhik',
+	},
+	{
+		key: 'BG:BG-14',
+		label: 'Bulgaria — Pernik',
+	},
+	{
+		key: 'BG:BG-15',
+		label: 'Bulgaria — Pleven',
+	},
+	{
+		key: 'BG:BG-16',
+		label: 'Bulgaria — Plovdiv',
+	},
+	{
+		key: 'BG:BG-17',
+		label: 'Bulgaria — Razgrad',
+	},
+	{
+		key: 'BG:BG-18',
+		label: 'Bulgaria — Ruse',
+	},
+	{
+		key: 'BG:BG-27',
+		label: 'Bulgaria — Shumen',
+	},
+	{
+		key: 'BG:BG-19',
+		label: 'Bulgaria — Silistra',
+	},
+	{
+		key: 'BG:BG-20',
+		label: 'Bulgaria — Sliven',
+	},
+	{
+		key: 'BG:BG-21',
+		label: 'Bulgaria — Smolyan',
+	},
+	{
+		key: 'BG:BG-23',
+		label: 'Bulgaria — Sofia District',
+	},
+	{
+		key: 'BG:BG-22',
+		label: 'Bulgaria — Sofia',
+	},
+	{
+		key: 'BG:BG-24',
+		label: 'Bulgaria — Stara Zagora',
+	},
+	{
+		key: 'BG:BG-25',
+		label: 'Bulgaria — Targovishte',
+	},
+	{
+		key: 'BG:BG-03',
+		label: 'Bulgaria — Varna',
+	},
+	{
+		key: 'BG:BG-04',
+		label: 'Bulgaria — Veliko Tarnovo',
+	},
+	{
+		key: 'BG:BG-05',
+		label: 'Bulgaria — Vidin',
+	},
+	{
+		key: 'BG:BG-06',
+		label: 'Bulgaria — Vratsa',
+	},
+	{
+		key: 'BG:BG-28',
+		label: 'Bulgaria — Yambol',
+	},
+	{
+		key: 'BF',
+		label: 'Burkina Faso',
+	},
+	{
+		key: 'BI',
+		label: 'Burundi',
+	},
+	{
+		key: 'KH',
+		label: 'Cambodia',
+	},
+	{
+		key: 'CM',
+		label: 'Cameroon',
+	},
+	{
+		key: 'CA:AB',
+		label: 'Canada — Alberta',
+	},
+	{
+		key: 'CA:BC',
+		label: 'Canada — British Columbia',
+	},
+	{
+		key: 'CA:MB',
+		label: 'Canada — Manitoba',
+	},
+	{
+		key: 'CA:NB',
+		label: 'Canada — New Brunswick',
+	},
+	{
+		key: 'CA:NL',
+		label: 'Canada — Newfoundland and Labrador',
+	},
+	{
+		key: 'CA:NT',
+		label: 'Canada — Northwest Territories',
+	},
+	{
+		key: 'CA:NS',
+		label: 'Canada — Nova Scotia',
+	},
+	{
+		key: 'CA:NU',
+		label: 'Canada — Nunavut',
+	},
+	{
+		key: 'CA:ON',
+		label: 'Canada — Ontario',
+	},
+	{
+		key: 'CA:PE',
+		label: 'Canada — Prince Edward Island',
+	},
+	{
+		key: 'CA:QC',
+		label: 'Canada — Quebec',
+	},
+	{
+		key: 'CA:SK',
+		label: 'Canada — Saskatchewan',
+	},
+	{
+		key: 'CA:YT',
+		label: 'Canada — Yukon Territory',
+	},
+	{
+		key: 'CV',
+		label: 'Cape Verde',
+	},
+	{
+		key: 'KY',
+		label: 'Cayman Islands',
+	},
+	{
+		key: 'CF',
+		label: 'Central African Republic',
+	},
+	{
+		key: 'TD',
+		label: 'Chad',
+	},
+	{
+		key: 'CL:CL-AI',
+		label: 'Chile — Aisén del General Carlos Ibañez del Campo',
+	},
+	{
+		key: 'CL:CL-AN',
+		label: 'Chile — Antofagasta',
+	},
+	{
+		key: 'CL:CL-AP',
+		label: 'Chile — Arica y Parinacota',
+	},
+	{
+		key: 'CL:CL-AR',
+		label: 'Chile — La Araucanía',
+	},
+	{
+		key: 'CL:CL-AT',
+		label: 'Chile — Atacama',
+	},
+	{
+		key: 'CL:CL-BI',
+		label: 'Chile — Biobío',
+	},
+	{
+		key: 'CL:CL-CO',
+		label: 'Chile — Coquimbo',
+	},
+	{
+		key: 'CL:CL-LI',
+		label: "Chile — Libertador General Bernardo O'Higgins",
+	},
+	{
+		key: 'CL:CL-LL',
+		label: 'Chile — Los Lagos',
+	},
+	{
+		key: 'CL:CL-LR',
+		label: 'Chile — Los Ríos',
+	},
+	{
+		key: 'CL:CL-MA',
+		label: 'Chile — Magallanes',
+	},
+	{
+		key: 'CL:CL-ML',
+		label: 'Chile — Maule',
+	},
+	{
+		key: 'CL:CL-NB',
+		label: 'Chile — Ñuble',
+	},
+	{
+		key: 'CL:CL-RM',
+		label: 'Chile — Región Metropolitana de Santiago',
+	},
+	{
+		key: 'CL:CL-TA',
+		label: 'Chile — Tarapacá',
+	},
+	{
+		key: 'CL:CL-VS',
+		label: 'Chile — Valparaíso',
+	},
+	{
+		key: 'CN:CN1',
+		label: 'China — Yunnan / 云南',
+	},
+	{
+		key: 'CN:CN2',
+		label: 'China — Beijing / 北京',
+	},
+	{
+		key: 'CN:CN3',
+		label: 'China — Tianjin / 天津',
+	},
+	{
+		key: 'CN:CN4',
+		label: 'China — Hebei / 河北',
+	},
+	{
+		key: 'CN:CN5',
+		label: 'China — Shanxi / 山西',
+	},
+	{
+		key: 'CN:CN6',
+		label: 'China — Inner Mongolia / 內蒙古',
+	},
+	{
+		key: 'CN:CN7',
+		label: 'China — Liaoning / 辽宁',
+	},
+	{
+		key: 'CN:CN8',
+		label: 'China — Jilin / 吉林',
+	},
+	{
+		key: 'CN:CN9',
+		label: 'China — Heilongjiang / 黑龙江',
+	},
+	{
+		key: 'CN:CN10',
+		label: 'China — Shanghai / 上海',
+	},
+	{
+		key: 'CN:CN11',
+		label: 'China — Jiangsu / 江苏',
+	},
+	{
+		key: 'CN:CN12',
+		label: 'China — Zhejiang / 浙江',
+	},
+	{
+		key: 'CN:CN13',
+		label: 'China — Anhui / 安徽',
+	},
+	{
+		key: 'CN:CN14',
+		label: 'China — Fujian / 福建',
+	},
+	{
+		key: 'CN:CN15',
+		label: 'China — Jiangxi / 江西',
+	},
+	{
+		key: 'CN:CN16',
+		label: 'China — Shandong / 山东',
+	},
+	{
+		key: 'CN:CN17',
+		label: 'China — Henan / 河南',
+	},
+	{
+		key: 'CN:CN18',
+		label: 'China — Hubei / 湖北',
+	},
+	{
+		key: 'CN:CN19',
+		label: 'China — Hunan / 湖南',
+	},
+	{
+		key: 'CN:CN20',
+		label: 'China — Guangdong / 广东',
+	},
+	{
+		key: 'CN:CN21',
+		label: 'China — Guangxi Zhuang / 广西壮族',
+	},
+	{
+		key: 'CN:CN22',
+		label: 'China — Hainan / 海南',
+	},
+	{
+		key: 'CN:CN23',
+		label: 'China — Chongqing / 重庆',
+	},
+	{
+		key: 'CN:CN24',
+		label: 'China — Sichuan / 四川',
+	},
+	{
+		key: 'CN:CN25',
+		label: 'China — Guizhou / 贵州',
+	},
+	{
+		key: 'CN:CN26',
+		label: 'China — Shaanxi / 陕西',
+	},
+	{
+		key: 'CN:CN27',
+		label: 'China — Gansu / 甘肃',
+	},
+	{
+		key: 'CN:CN28',
+		label: 'China — Qinghai / 青海',
+	},
+	{
+		key: 'CN:CN29',
+		label: 'China — Ningxia Hui / 宁夏',
+	},
+	{
+		key: 'CN:CN30',
+		label: 'China — Macao / 澳门',
+	},
+	{
+		key: 'CN:CN31',
+		label: 'China — Tibet / 西藏',
+	},
+	{
+		key: 'CN:CN32',
+		label: 'China — Xinjiang / 新疆',
+	},
+	{
+		key: 'CX',
+		label: 'Christmas Island',
+	},
+	{
+		key: 'CC',
+		label: 'Cocos (Keeling) Islands',
+	},
+	{
+		key: 'CO:CO-AMA',
+		label: 'Colombia — Amazonas',
+	},
+	{
+		key: 'CO:CO-ANT',
+		label: 'Colombia — Antioquia',
+	},
+	{
+		key: 'CO:CO-ARA',
+		label: 'Colombia — Arauca',
+	},
+	{
+		key: 'CO:CO-ATL',
+		label: 'Colombia — Atlántico',
+	},
+	{
+		key: 'CO:CO-BOL',
+		label: 'Colombia — Bolívar',
+	},
+	{
+		key: 'CO:CO-BOY',
+		label: 'Colombia — Boyacá',
+	},
+	{
+		key: 'CO:CO-CAL',
+		label: 'Colombia — Caldas',
+	},
+	{
+		key: 'CO:CO-CAQ',
+		label: 'Colombia — Caquetá',
+	},
+	{
+		key: 'CO:CO-CAS',
+		label: 'Colombia — Casanare',
+	},
+	{
+		key: 'CO:CO-CAU',
+		label: 'Colombia — Cauca',
+	},
+	{
+		key: 'CO:CO-CES',
+		label: 'Colombia — Cesar',
+	},
+	{
+		key: 'CO:CO-CHO',
+		label: 'Colombia — Chocó',
+	},
+	{
+		key: 'CO:CO-COR',
+		label: 'Colombia — Córdoba',
+	},
+	{
+		key: 'CO:CO-CUN',
+		label: 'Colombia — Cundinamarca',
+	},
+	{
+		key: 'CO:CO-DC',
+		label: 'Colombia — Capital District',
+	},
+	{
+		key: 'CO:CO-GUA',
+		label: 'Colombia — Guainía',
+	},
+	{
+		key: 'CO:CO-GUV',
+		label: 'Colombia — Guaviare',
+	},
+	{
+		key: 'CO:CO-HUI',
+		label: 'Colombia — Huila',
+	},
+	{
+		key: 'CO:CO-LAG',
+		label: 'Colombia — La Guajira',
+	},
+	{
+		key: 'CO:CO-MAG',
+		label: 'Colombia — Magdalena',
+	},
+	{
+		key: 'CO:CO-MET',
+		label: 'Colombia — Meta',
+	},
+	{
+		key: 'CO:CO-NAR',
+		label: 'Colombia — Nariño',
+	},
+	{
+		key: 'CO:CO-NSA',
+		label: 'Colombia — Norte de Santander',
+	},
+	{
+		key: 'CO:CO-PUT',
+		label: 'Colombia — Putumayo',
+	},
+	{
+		key: 'CO:CO-QUI',
+		label: 'Colombia — Quindío',
+	},
+	{
+		key: 'CO:CO-RIS',
+		label: 'Colombia — Risaralda',
+	},
+	{
+		key: 'CO:CO-SAN',
+		label: 'Colombia — Santander',
+	},
+	{
+		key: 'CO:CO-SAP',
+		label: 'Colombia — San Andrés & Providencia',
+	},
+	{
+		key: 'CO:CO-SUC',
+		label: 'Colombia — Sucre',
+	},
+	{
+		key: 'CO:CO-TOL',
+		label: 'Colombia — Tolima',
+	},
+	{
+		key: 'CO:CO-VAC',
+		label: 'Colombia — Valle del Cauca',
+	},
+	{
+		key: 'CO:CO-VAU',
+		label: 'Colombia — Vaupés',
+	},
+	{
+		key: 'CO:CO-VID',
+		label: 'Colombia — Vichada',
+	},
+	{
+		key: 'KM',
+		label: 'Comoros',
+	},
+	{
+		key: 'CG',
+		label: 'Congo (Brazzaville)',
+	},
+	{
+		key: 'CD',
+		label: 'Congo (Kinshasa)',
+	},
+	{
+		key: 'CK',
+		label: 'Cook Islands',
+	},
+	{
+		key: 'CR:CR-A',
+		label: 'Costa Rica — Alajuela',
+	},
+	{
+		key: 'CR:CR-C',
+		label: 'Costa Rica — Cartago',
+	},
+	{
+		key: 'CR:CR-G',
+		label: 'Costa Rica — Guanacaste',
+	},
+	{
+		key: 'CR:CR-H',
+		label: 'Costa Rica — Heredia',
+	},
+	{
+		key: 'CR:CR-L',
+		label: 'Costa Rica — Limón',
+	},
+	{
+		key: 'CR:CR-P',
+		label: 'Costa Rica — Puntarenas',
+	},
+	{
+		key: 'CR:CR-SJ',
+		label: 'Costa Rica — San José',
+	},
+	{
+		key: 'HR',
+		label: 'Croatia',
+	},
+	{
+		key: 'CU',
+		label: 'Cuba',
+	},
+	{
+		key: 'CW',
+		label: 'Curaçao',
+	},
+	{
+		key: 'CY',
+		label: 'Cyprus',
+	},
+	{
+		key: 'CZ',
+		label: 'Czech Republic',
+	},
+	{
+		key: 'DK',
+		label: 'Denmark',
+	},
+	{
+		key: 'DJ',
+		label: 'Djibouti',
+	},
+	{
+		key: 'DM',
+		label: 'Dominica',
+	},
+	{
+		key: 'DO:DO-01',
+		label: 'Dominican Republic — Distrito Nacional',
+	},
+	{
+		key: 'DO:DO-02',
+		label: 'Dominican Republic — Azua',
+	},
+	{
+		key: 'DO:DO-03',
+		label: 'Dominican Republic — Baoruco',
+	},
+	{
+		key: 'DO:DO-04',
+		label: 'Dominican Republic — Barahona',
+	},
+	{
+		key: 'DO:DO-33',
+		label: 'Dominican Republic — Cibao Nordeste',
+	},
+	{
+		key: 'DO:DO-34',
+		label: 'Dominican Republic — Cibao Noroeste',
+	},
+	{
+		key: 'DO:DO-35',
+		label: 'Dominican Republic — Cibao Norte',
+	},
+	{
+		key: 'DO:DO-36',
+		label: 'Dominican Republic — Cibao Sur',
+	},
+	{
+		key: 'DO:DO-05',
+		label: 'Dominican Republic — Dajabón',
+	},
+	{
+		key: 'DO:DO-06',
+		label: 'Dominican Republic — Duarte',
+	},
+	{
+		key: 'DO:DO-08',
+		label: 'Dominican Republic — El Seibo',
+	},
+	{
+		key: 'DO:DO-37',
+		label: 'Dominican Republic — El Valle',
+	},
+	{
+		key: 'DO:DO-07',
+		label: 'Dominican Republic — Elías Piña',
+	},
+	{
+		key: 'DO:DO-38',
+		label: 'Dominican Republic — Enriquillo',
+	},
+	{
+		key: 'DO:DO-09',
+		label: 'Dominican Republic — Espaillat',
+	},
+	{
+		key: 'DO:DO-30',
+		label: 'Dominican Republic — Hato Mayor',
+	},
+	{
+		key: 'DO:DO-19',
+		label: 'Dominican Republic — Hermanas Mirabal',
+	},
+	{
+		key: 'DO:DO-39',
+		label: 'Dominican Republic — Higüamo',
+	},
+	{
+		key: 'DO:DO-10',
+		label: 'Dominican Republic — Independencia',
+	},
+	{
+		key: 'DO:DO-11',
+		label: 'Dominican Republic — La Altagracia',
+	},
+	{
+		key: 'DO:DO-12',
+		label: 'Dominican Republic — La Romana',
+	},
+	{
+		key: 'DO:DO-13',
+		label: 'Dominican Republic — La Vega',
+	},
+	{
+		key: 'DO:DO-14',
+		label: 'Dominican Republic — María Trinidad Sánchez',
+	},
+	{
+		key: 'DO:DO-28',
+		label: 'Dominican Republic — Monseñor Nouel',
+	},
+	{
+		key: 'DO:DO-15',
+		label: 'Dominican Republic — Monte Cristi',
+	},
+	{
+		key: 'DO:DO-29',
+		label: 'Dominican Republic — Monte Plata',
+	},
+	{
+		key: 'DO:DO-40',
+		label: 'Dominican Republic — Ozama',
+	},
+	{
+		key: 'DO:DO-16',
+		label: 'Dominican Republic — Pedernales',
+	},
+	{
+		key: 'DO:DO-17',
+		label: 'Dominican Republic — Peravia',
+	},
+	{
+		key: 'DO:DO-18',
+		label: 'Dominican Republic — Puerto Plata',
+	},
+	{
+		key: 'DO:DO-20',
+		label: 'Dominican Republic — Samaná',
+	},
+	{
+		key: 'DO:DO-21',
+		label: 'Dominican Republic — San Cristóbal',
+	},
+	{
+		key: 'DO:DO-31',
+		label: 'Dominican Republic — San José de Ocoa',
+	},
+	{
+		key: 'DO:DO-22',
+		label: 'Dominican Republic — San Juan',
+	},
+	{
+		key: 'DO:DO-23',
+		label: 'Dominican Republic — San Pedro de Macorís',
+	},
+	{
+		key: 'DO:DO-24',
+		label: 'Dominican Republic — Sánchez Ramírez',
+	},
+	{
+		key: 'DO:DO-25',
+		label: 'Dominican Republic — Santiago',
+	},
+	{
+		key: 'DO:DO-26',
+		label: 'Dominican Republic — Santiago Rodríguez',
+	},
+	{
+		key: 'DO:DO-32',
+		label: 'Dominican Republic — Santo Domingo',
+	},
+	{
+		key: 'DO:DO-41',
+		label: 'Dominican Republic — Valdesia',
+	},
+	{
+		key: 'DO:DO-27',
+		label: 'Dominican Republic — Valverde',
+	},
+	{
+		key: 'DO:DO-42',
+		label: 'Dominican Republic — Yuma',
+	},
+	{
+		key: 'EC:EC-A',
+		label: 'Ecuador — Azuay',
+	},
+	{
+		key: 'EC:EC-B',
+		label: 'Ecuador — Bolívar',
+	},
+	{
+		key: 'EC:EC-F',
+		label: 'Ecuador — Cañar',
+	},
+	{
+		key: 'EC:EC-C',
+		label: 'Ecuador — Carchi',
+	},
+	{
+		key: 'EC:EC-H',
+		label: 'Ecuador — Chimborazo',
+	},
+	{
+		key: 'EC:EC-X',
+		label: 'Ecuador — Cotopaxi',
+	},
+	{
+		key: 'EC:EC-O',
+		label: 'Ecuador — El Oro',
+	},
+	{
+		key: 'EC:EC-E',
+		label: 'Ecuador — Esmeraldas',
+	},
+	{
+		key: 'EC:EC-W',
+		label: 'Ecuador — Galápagos',
+	},
+	{
+		key: 'EC:EC-G',
+		label: 'Ecuador — Guayas',
+	},
+	{
+		key: 'EC:EC-I',
+		label: 'Ecuador — Imbabura',
+	},
+	{
+		key: 'EC:EC-L',
+		label: 'Ecuador — Loja',
+	},
+	{
+		key: 'EC:EC-R',
+		label: 'Ecuador — Los Ríos',
+	},
+	{
+		key: 'EC:EC-M',
+		label: 'Ecuador — Manabí',
+	},
+	{
+		key: 'EC:EC-S',
+		label: 'Ecuador — Morona-Santiago',
+	},
+	{
+		key: 'EC:EC-N',
+		label: 'Ecuador — Napo',
+	},
+	{
+		key: 'EC:EC-D',
+		label: 'Ecuador — Orellana',
+	},
+	{
+		key: 'EC:EC-Y',
+		label: 'Ecuador — Pastaza',
+	},
+	{
+		key: 'EC:EC-P',
+		label: 'Ecuador — Pichincha',
+	},
+	{
+		key: 'EC:EC-SE',
+		label: 'Ecuador — Santa Elena',
+	},
+	{
+		key: 'EC:EC-SD',
+		label: 'Ecuador — Santo Domingo de los Tsáchilas',
+	},
+	{
+		key: 'EC:EC-U',
+		label: 'Ecuador — Sucumbíos',
+	},
+	{
+		key: 'EC:EC-T',
+		label: 'Ecuador — Tungurahua',
+	},
+	{
+		key: 'EC:EC-Z',
+		label: 'Ecuador — Zamora-Chinchipe',
+	},
+	{
+		key: 'EG:EGALX',
+		label: 'Egypt — Alexandria',
+	},
+	{
+		key: 'EG:EGASN',
+		label: 'Egypt — Aswan',
+	},
+	{
+		key: 'EG:EGAST',
+		label: 'Egypt — Asyut',
+	},
+	{
+		key: 'EG:EGBA',
+		label: 'Egypt — Red Sea',
+	},
+	{
+		key: 'EG:EGBH',
+		label: 'Egypt — Beheira',
+	},
+	{
+		key: 'EG:EGBNS',
+		label: 'Egypt — Beni Suef',
+	},
+	{
+		key: 'EG:EGC',
+		label: 'Egypt — Cairo',
+	},
+	{
+		key: 'EG:EGDK',
+		label: 'Egypt — Dakahlia',
+	},
+	{
+		key: 'EG:EGDT',
+		label: 'Egypt — Damietta',
+	},
+	{
+		key: 'EG:EGFYM',
+		label: 'Egypt — Faiyum',
+	},
+	{
+		key: 'EG:EGGH',
+		label: 'Egypt — Gharbia',
+	},
+	{
+		key: 'EG:EGGZ',
+		label: 'Egypt — Giza',
+	},
+	{
+		key: 'EG:EGIS',
+		label: 'Egypt — Ismailia',
+	},
+	{
+		key: 'EG:EGJS',
+		label: 'Egypt — South Sinai',
+	},
+	{
+		key: 'EG:EGKB',
+		label: 'Egypt — Qalyubia',
+	},
+	{
+		key: 'EG:EGKFS',
+		label: 'Egypt — Kafr el-Sheikh',
+	},
+	{
+		key: 'EG:EGKN',
+		label: 'Egypt — Qena',
+	},
+	{
+		key: 'EG:EGLX',
+		label: 'Egypt — Luxor',
+	},
+	{
+		key: 'EG:EGMN',
+		label: 'Egypt — Minya',
+	},
+	{
+		key: 'EG:EGMNF',
+		label: 'Egypt — Monufia',
+	},
+	{
+		key: 'EG:EGMT',
+		label: 'Egypt — Matrouh',
+	},
+	{
+		key: 'EG:EGPTS',
+		label: 'Egypt — Port Said',
+	},
+	{
+		key: 'EG:EGSHG',
+		label: 'Egypt — Sohag',
+	},
+	{
+		key: 'EG:EGSHR',
+		label: 'Egypt — Al Sharqia',
+	},
+	{
+		key: 'EG:EGSIN',
+		label: 'Egypt — North Sinai',
+	},
+	{
+		key: 'EG:EGSUZ',
+		label: 'Egypt — Suez',
+	},
+	{
+		key: 'EG:EGWAD',
+		label: 'Egypt — New Valley',
+	},
+	{
+		key: 'SV:SV-AH',
+		label: 'El Salvador — Ahuachapán',
+	},
+	{
+		key: 'SV:SV-CA',
+		label: 'El Salvador — Cabañas',
+	},
+	{
+		key: 'SV:SV-CH',
+		label: 'El Salvador — Chalatenango',
+	},
+	{
+		key: 'SV:SV-CU',
+		label: 'El Salvador — Cuscatlán',
+	},
+	{
+		key: 'SV:SV-LI',
+		label: 'El Salvador — La Libertad',
+	},
+	{
+		key: 'SV:SV-MO',
+		label: 'El Salvador — Morazán',
+	},
+	{
+		key: 'SV:SV-PA',
+		label: 'El Salvador — La Paz',
+	},
+	{
+		key: 'SV:SV-SA',
+		label: 'El Salvador — Santa Ana',
+	},
+	{
+		key: 'SV:SV-SM',
+		label: 'El Salvador — San Miguel',
+	},
+	{
+		key: 'SV:SV-SO',
+		label: 'El Salvador — Sonsonate',
+	},
+	{
+		key: 'SV:SV-SS',
+		label: 'El Salvador — San Salvador',
+	},
+	{
+		key: 'SV:SV-SV',
+		label: 'El Salvador — San Vicente',
+	},
+	{
+		key: 'SV:SV-UN',
+		label: 'El Salvador — La Unión',
+	},
+	{
+		key: 'SV:SV-US',
+		label: 'El Salvador — Usulután',
+	},
+	{
+		key: 'GQ',
+		label: 'Equatorial Guinea',
+	},
+	{
+		key: 'ER',
+		label: 'Eritrea',
+	},
+	{
+		key: 'EE',
+		label: 'Estonia',
+	},
+	{
+		key: 'SZ',
+		label: 'Eswatini',
+	},
+	{
+		key: 'ET',
+		label: 'Ethiopia',
+	},
+	{
+		key: 'FK',
+		label: 'Falkland Islands',
+	},
+	{
+		key: 'FO',
+		label: 'Faroe Islands',
+	},
+	{
+		key: 'FJ',
+		label: 'Fiji',
+	},
+	{
+		key: 'FI',
+		label: 'Finland',
+	},
+	{
+		key: 'FR',
+		label: 'France',
+	},
+	{
+		key: 'GF',
+		label: 'French Guiana',
+	},
+	{
+		key: 'PF',
+		label: 'French Polynesia',
+	},
+	{
+		key: 'TF',
+		label: 'French Southern Territories',
+	},
+	{
+		key: 'GA',
+		label: 'Gabon',
+	},
+	{
+		key: 'GM',
+		label: 'Gambia',
+	},
+	{
+		key: 'GE',
+		label: 'Georgia',
+	},
+	{
+		key: 'DE:DE-BW',
+		label: 'Germany — Baden-Württemberg',
+	},
+	{
+		key: 'DE:DE-BY',
+		label: 'Germany — Bavaria',
+	},
+	{
+		key: 'DE:DE-BE',
+		label: 'Germany — Berlin',
+	},
+	{
+		key: 'DE:DE-BB',
+		label: 'Germany — Brandenburg',
+	},
+	{
+		key: 'DE:DE-HB',
+		label: 'Germany — Bremen',
+	},
+	{
+		key: 'DE:DE-HH',
+		label: 'Germany — Hamburg',
+	},
+	{
+		key: 'DE:DE-HE',
+		label: 'Germany — Hesse',
+	},
+	{
+		key: 'DE:DE-MV',
+		label: 'Germany — Mecklenburg-Vorpommern',
+	},
+	{
+		key: 'DE:DE-NI',
+		label: 'Germany — Lower Saxony',
+	},
+	{
+		key: 'DE:DE-NW',
+		label: 'Germany — North Rhine-Westphalia',
+	},
+	{
+		key: 'DE:DE-RP',
+		label: 'Germany — Rhineland-Palatinate',
+	},
+	{
+		key: 'DE:DE-SL',
+		label: 'Germany — Saarland',
+	},
+	{
+		key: 'DE:DE-SN',
+		label: 'Germany — Saxony',
+	},
+	{
+		key: 'DE:DE-ST',
+		label: 'Germany — Saxony-Anhalt',
+	},
+	{
+		key: 'DE:DE-SH',
+		label: 'Germany — Schleswig-Holstein',
+	},
+	{
+		key: 'DE:DE-TH',
+		label: 'Germany — Thuringia',
+	},
+	{
+		key: 'GH:AF',
+		label: 'Ghana — Ahafo',
+	},
+	{
+		key: 'GH:AH',
+		label: 'Ghana — Ashanti',
+	},
+	{
+		key: 'GH:BA',
+		label: 'Ghana — Brong-Ahafo',
+	},
+	{
+		key: 'GH:BO',
+		label: 'Ghana — Bono',
+	},
+	{
+		key: 'GH:BE',
+		label: 'Ghana — Bono East',
+	},
+	{
+		key: 'GH:CP',
+		label: 'Ghana — Central',
+	},
+	{
+		key: 'GH:EP',
+		label: 'Ghana — Eastern',
+	},
+	{
+		key: 'GH:AA',
+		label: 'Ghana — Greater Accra',
+	},
+	{
+		key: 'GH:NE',
+		label: 'Ghana — North East',
+	},
+	{
+		key: 'GH:NP',
+		label: 'Ghana — Northern',
+	},
+	{
+		key: 'GH:OT',
+		label: 'Ghana — Oti',
+	},
+	{
+		key: 'GH:SV',
+		label: 'Ghana — Savannah',
+	},
+	{
+		key: 'GH:UE',
+		label: 'Ghana — Upper East',
+	},
+	{
+		key: 'GH:UW',
+		label: 'Ghana — Upper West',
+	},
+	{
+		key: 'GH:TV',
+		label: 'Ghana — Volta',
+	},
+	{
+		key: 'GH:WP',
+		label: 'Ghana — Western',
+	},
+	{
+		key: 'GH:WN',
+		label: 'Ghana — Western North',
+	},
+	{
+		key: 'GI',
+		label: 'Gibraltar',
+	},
+	{
+		key: 'GR:I',
+		label: 'Greece — Attica',
+	},
+	{
+		key: 'GR:A',
+		label: 'Greece — East Macedonia and Thrace',
+	},
+	{
+		key: 'GR:B',
+		label: 'Greece — Central Macedonia',
+	},
+	{
+		key: 'GR:C',
+		label: 'Greece — West Macedonia',
+	},
+	{
+		key: 'GR:D',
+		label: 'Greece — Epirus',
+	},
+	{
+		key: 'GR:E',
+		label: 'Greece — Thessaly',
+	},
+	{
+		key: 'GR:F',
+		label: 'Greece — Ionian Islands',
+	},
+	{
+		key: 'GR:G',
+		label: 'Greece — West Greece',
+	},
+	{
+		key: 'GR:H',
+		label: 'Greece — Central Greece',
+	},
+	{
+		key: 'GR:J',
+		label: 'Greece — Peloponnese',
+	},
+	{
+		key: 'GR:K',
+		label: 'Greece — North Aegean',
+	},
+	{
+		key: 'GR:L',
+		label: 'Greece — South Aegean',
+	},
+	{
+		key: 'GR:M',
+		label: 'Greece — Crete',
+	},
+	{
+		key: 'GL',
+		label: 'Greenland',
+	},
+	{
+		key: 'GD',
+		label: 'Grenada',
+	},
+	{
+		key: 'GP',
+		label: 'Guadeloupe',
+	},
+	{
+		key: 'GU',
+		label: 'Guam',
+	},
+	{
+		key: 'GT:GT-AV',
+		label: 'Guatemala — Alta Verapaz',
+	},
+	{
+		key: 'GT:GT-BV',
+		label: 'Guatemala — Baja Verapaz',
+	},
+	{
+		key: 'GT:GT-CM',
+		label: 'Guatemala — Chimaltenango',
+	},
+	{
+		key: 'GT:GT-CQ',
+		label: 'Guatemala — Chiquimula',
+	},
+	{
+		key: 'GT:GT-PR',
+		label: 'Guatemala — El Progreso',
+	},
+	{
+		key: 'GT:GT-ES',
+		label: 'Guatemala — Escuintla',
+	},
+	{
+		key: 'GT:GT-GU',
+		label: 'Guatemala — Guatemala',
+	},
+	{
+		key: 'GT:GT-HU',
+		label: 'Guatemala — Huehuetenango',
+	},
+	{
+		key: 'GT:GT-IZ',
+		label: 'Guatemala — Izabal',
+	},
+	{
+		key: 'GT:GT-JA',
+		label: 'Guatemala — Jalapa',
+	},
+	{
+		key: 'GT:GT-JU',
+		label: 'Guatemala — Jutiapa',
+	},
+	{
+		key: 'GT:GT-PE',
+		label: 'Guatemala — Petén',
+	},
+	{
+		key: 'GT:GT-QZ',
+		label: 'Guatemala — Quetzaltenango',
+	},
+	{
+		key: 'GT:GT-QC',
+		label: 'Guatemala — Quiché',
+	},
+	{
+		key: 'GT:GT-RE',
+		label: 'Guatemala — Retalhuleu',
+	},
+	{
+		key: 'GT:GT-SA',
+		label: 'Guatemala — Sacatepéquez',
+	},
+	{
+		key: 'GT:GT-SM',
+		label: 'Guatemala — San Marcos',
+	},
+	{
+		key: 'GT:GT-SR',
+		label: 'Guatemala — Santa Rosa',
+	},
+	{
+		key: 'GT:GT-SO',
+		label: 'Guatemala — Sololá',
+	},
+	{
+		key: 'GT:GT-SU',
+		label: 'Guatemala — Suchitepéquez',
+	},
+	{
+		key: 'GT:GT-TO',
+		label: 'Guatemala — Totonicapán',
+	},
+	{
+		key: 'GT:GT-ZA',
+		label: 'Guatemala — Zacapa',
+	},
+	{
+		key: 'GG',
+		label: 'Guernsey',
+	},
+	{
+		key: 'GN',
+		label: 'Guinea',
+	},
+	{
+		key: 'GW',
+		label: 'Guinea-Bissau',
+	},
+	{
+		key: 'GY',
+		label: 'Guyana',
+	},
+	{
+		key: 'HT',
+		label: 'Haiti',
+	},
+	{
+		key: 'HM',
+		label: 'Heard Island and McDonald Islands',
+	},
+	{
+		key: 'HN:HN-AT',
+		label: 'Honduras — Atlántida',
+	},
+	{
+		key: 'HN:HN-IB',
+		label: 'Honduras — Bay Islands',
+	},
+	{
+		key: 'HN:HN-CH',
+		label: 'Honduras — Choluteca',
+	},
+	{
+		key: 'HN:HN-CL',
+		label: 'Honduras — Colón',
+	},
+	{
+		key: 'HN:HN-CM',
+		label: 'Honduras — Comayagua',
+	},
+	{
+		key: 'HN:HN-CP',
+		label: 'Honduras — Copán',
+	},
+	{
+		key: 'HN:HN-CR',
+		label: 'Honduras — Cortés',
+	},
+	{
+		key: 'HN:HN-EP',
+		label: 'Honduras — El Paraíso',
+	},
+	{
+		key: 'HN:HN-FM',
+		label: 'Honduras — Francisco Morazán',
+	},
+	{
+		key: 'HN:HN-GD',
+		label: 'Honduras — Gracias a Dios',
+	},
+	{
+		key: 'HN:HN-IN',
+		label: 'Honduras — Intibucá',
+	},
+	{
+		key: 'HN:HN-LE',
+		label: 'Honduras — Lempira',
+	},
+	{
+		key: 'HN:HN-LP',
+		label: 'Honduras — La Paz',
+	},
+	{
+		key: 'HN:HN-OC',
+		label: 'Honduras — Ocotepeque',
+	},
+	{
+		key: 'HN:HN-OL',
+		label: 'Honduras — Olancho',
+	},
+	{
+		key: 'HN:HN-SB',
+		label: 'Honduras — Santa Bárbara',
+	},
+	{
+		key: 'HN:HN-VA',
+		label: 'Honduras — Valle',
+	},
+	{
+		key: 'HN:HN-YO',
+		label: 'Honduras — Yoro',
+	},
+	{
+		key: 'HK:HONG KONG',
+		label: 'Hong Kong — Hong Kong Island',
+	},
+	{
+		key: 'HK:KOWLOON',
+		label: 'Hong Kong — Kowloon',
+	},
+	{
+		key: 'HK:NEW TERRITORIES',
+		label: 'Hong Kong — New Territories',
+	},
+	{
+		key: 'HU:BK',
+		label: 'Hungary — Bács-Kiskun',
+	},
+	{
+		key: 'HU:BE',
+		label: 'Hungary — Békés',
+	},
+	{
+		key: 'HU:BA',
+		label: 'Hungary — Baranya',
+	},
+	{
+		key: 'HU:BZ',
+		label: 'Hungary — Borsod-Abaúj-Zemplén',
+	},
+	{
+		key: 'HU:BU',
+		label: 'Hungary — Budapest',
+	},
+	{
+		key: 'HU:CS',
+		label: 'Hungary — Csongrád-Csanád',
+	},
+	{
+		key: 'HU:FE',
+		label: 'Hungary — Fejér',
+	},
+	{
+		key: 'HU:GS',
+		label: 'Hungary — Győr-Moson-Sopron',
+	},
+	{
+		key: 'HU:HB',
+		label: 'Hungary — Hajdú-Bihar',
+	},
+	{
+		key: 'HU:HE',
+		label: 'Hungary — Heves',
+	},
+	{
+		key: 'HU:JN',
+		label: 'Hungary — Jász-Nagykun-Szolnok',
+	},
+	{
+		key: 'HU:KE',
+		label: 'Hungary — Komárom-Esztergom',
+	},
+	{
+		key: 'HU:NO',
+		label: 'Hungary — Nógrád',
+	},
+	{
+		key: 'HU:PE',
+		label: 'Hungary — Pest',
+	},
+	{
+		key: 'HU:SO',
+		label: 'Hungary — Somogy',
+	},
+	{
+		key: 'HU:SZ',
+		label: 'Hungary — Szabolcs-Szatmár-Bereg',
+	},
+	{
+		key: 'HU:TO',
+		label: 'Hungary — Tolna',
+	},
+	{
+		key: 'HU:VA',
+		label: 'Hungary — Vas',
+	},
+	{
+		key: 'HU:VE',
+		label: 'Hungary — Veszprém',
+	},
+	{
+		key: 'HU:ZA',
+		label: 'Hungary — Zala',
+	},
+	{
+		key: 'IS',
+		label: 'Iceland',
+	},
+	{
+		key: 'IN:AP',
+		label: 'India — Andhra Pradesh',
+	},
+	{
+		key: 'IN:AR',
+		label: 'India — Arunachal Pradesh',
+	},
+	{
+		key: 'IN:AS',
+		label: 'India — Assam',
+	},
+	{
+		key: 'IN:BR',
+		label: 'India — Bihar',
+	},
+	{
+		key: 'IN:CT',
+		label: 'India — Chhattisgarh',
+	},
+	{
+		key: 'IN:GA',
+		label: 'India — Goa',
+	},
+	{
+		key: 'IN:GJ',
+		label: 'India — Gujarat',
+	},
+	{
+		key: 'IN:HR',
+		label: 'India — Haryana',
+	},
+	{
+		key: 'IN:HP',
+		label: 'India — Himachal Pradesh',
+	},
+	{
+		key: 'IN:JK',
+		label: 'India — Jammu and Kashmir',
+	},
+	{
+		key: 'IN:JH',
+		label: 'India — Jharkhand',
+	},
+	{
+		key: 'IN:KA',
+		label: 'India — Karnataka',
+	},
+	{
+		key: 'IN:KL',
+		label: 'India — Kerala',
+	},
+	{
+		key: 'IN:LA',
+		label: 'India — Ladakh',
+	},
+	{
+		key: 'IN:MP',
+		label: 'India — Madhya Pradesh',
+	},
+	{
+		key: 'IN:MH',
+		label: 'India — Maharashtra',
+	},
+	{
+		key: 'IN:MN',
+		label: 'India — Manipur',
+	},
+	{
+		key: 'IN:ML',
+		label: 'India — Meghalaya',
+	},
+	{
+		key: 'IN:MZ',
+		label: 'India — Mizoram',
+	},
+	{
+		key: 'IN:NL',
+		label: 'India — Nagaland',
+	},
+	{
+		key: 'IN:OR',
+		label: 'India — Odisha',
+	},
+	{
+		key: 'IN:PB',
+		label: 'India — Punjab',
+	},
+	{
+		key: 'IN:RJ',
+		label: 'India — Rajasthan',
+	},
+	{
+		key: 'IN:SK',
+		label: 'India — Sikkim',
+	},
+	{
+		key: 'IN:TN',
+		label: 'India — Tamil Nadu',
+	},
+	{
+		key: 'IN:TS',
+		label: 'India — Telangana',
+	},
+	{
+		key: 'IN:TR',
+		label: 'India — Tripura',
+	},
+	{
+		key: 'IN:UK',
+		label: 'India — Uttarakhand',
+	},
+	{
+		key: 'IN:UP',
+		label: 'India — Uttar Pradesh',
+	},
+	{
+		key: 'IN:WB',
+		label: 'India — West Bengal',
+	},
+	{
+		key: 'IN:AN',
+		label: 'India — Andaman and Nicobar Islands',
+	},
+	{
+		key: 'IN:CH',
+		label: 'India — Chandigarh',
+	},
+	{
+		key: 'IN:DN',
+		label: 'India — Dadra and Nagar Haveli',
+	},
+	{
+		key: 'IN:DD',
+		label: 'India — Daman and Diu',
+	},
+	{
+		key: 'IN:DL',
+		label: 'India — Delhi',
+	},
+	{
+		key: 'IN:LD',
+		label: 'India — Lakshadeep',
+	},
+	{
+		key: 'IN:PY',
+		label: 'India — Pondicherry (Puducherry)',
+	},
+	{
+		key: 'ID:AC',
+		label: 'Indonesia — Daerah Istimewa Aceh',
+	},
+	{
+		key: 'ID:SU',
+		label: 'Indonesia — Sumatera Utara',
+	},
+	{
+		key: 'ID:SB',
+		label: 'Indonesia — Sumatera Barat',
+	},
+	{
+		key: 'ID:RI',
+		label: 'Indonesia — Riau',
+	},
+	{
+		key: 'ID:KR',
+		label: 'Indonesia — Kepulauan Riau',
+	},
+	{
+		key: 'ID:JA',
+		label: 'Indonesia — Jambi',
+	},
+	{
+		key: 'ID:SS',
+		label: 'Indonesia — Sumatera Selatan',
+	},
+	{
+		key: 'ID:BB',
+		label: 'Indonesia — Bangka Belitung',
+	},
+	{
+		key: 'ID:BE',
+		label: 'Indonesia — Bengkulu',
+	},
+	{
+		key: 'ID:LA',
+		label: 'Indonesia — Lampung',
+	},
+	{
+		key: 'ID:JK',
+		label: 'Indonesia — DKI Jakarta',
+	},
+	{
+		key: 'ID:JB',
+		label: 'Indonesia — Jawa Barat',
+	},
+	{
+		key: 'ID:BT',
+		label: 'Indonesia — Banten',
+	},
+	{
+		key: 'ID:JT',
+		label: 'Indonesia — Jawa Tengah',
+	},
+	{
+		key: 'ID:JI',
+		label: 'Indonesia — Jawa Timur',
+	},
+	{
+		key: 'ID:YO',
+		label: 'Indonesia — Daerah Istimewa Yogyakarta',
+	},
+	{
+		key: 'ID:BA',
+		label: 'Indonesia — Bali',
+	},
+	{
+		key: 'ID:NB',
+		label: 'Indonesia — Nusa Tenggara Barat',
+	},
+	{
+		key: 'ID:NT',
+		label: 'Indonesia — Nusa Tenggara Timur',
+	},
+	{
+		key: 'ID:KB',
+		label: 'Indonesia — Kalimantan Barat',
+	},
+	{
+		key: 'ID:KT',
+		label: 'Indonesia — Kalimantan Tengah',
+	},
+	{
+		key: 'ID:KI',
+		label: 'Indonesia — Kalimantan Timur',
+	},
+	{
+		key: 'ID:KS',
+		label: 'Indonesia — Kalimantan Selatan',
+	},
+	{
+		key: 'ID:KU',
+		label: 'Indonesia — Kalimantan Utara',
+	},
+	{
+		key: 'ID:SA',
+		label: 'Indonesia — Sulawesi Utara',
+	},
+	{
+		key: 'ID:ST',
+		label: 'Indonesia — Sulawesi Tengah',
+	},
+	{
+		key: 'ID:SG',
+		label: 'Indonesia — Sulawesi Tenggara',
+	},
+	{
+		key: 'ID:SR',
+		label: 'Indonesia — Sulawesi Barat',
+	},
+	{
+		key: 'ID:SN',
+		label: 'Indonesia — Sulawesi Selatan',
+	},
+	{
+		key: 'ID:GO',
+		label: 'Indonesia — Gorontalo',
+	},
+	{
+		key: 'ID:MA',
+		label: 'Indonesia — Maluku',
+	},
+	{
+		key: 'ID:MU',
+		label: 'Indonesia — Maluku Utara',
+	},
+	{
+		key: 'ID:PA',
+		label: 'Indonesia — Papua',
+	},
+	{
+		key: 'ID:PB',
+		label: 'Indonesia — Papua Barat',
+	},
+	{
+		key: 'IR:KHZ',
+		label: 'Iran — Khuzestan (خوزستان)',
+	},
+	{
+		key: 'IR:THR',
+		label: 'Iran — Tehran (تهران)',
+	},
+	{
+		key: 'IR:ILM',
+		label: 'Iran — Ilaam (ایلام)',
+	},
+	{
+		key: 'IR:BHR',
+		label: 'Iran — Bushehr (بوشهر)',
+	},
+	{
+		key: 'IR:ADL',
+		label: 'Iran — Ardabil (اردبیل)',
+	},
+	{
+		key: 'IR:ESF',
+		label: 'Iran — Isfahan (اصفهان)',
+	},
+	{
+		key: 'IR:YZD',
+		label: 'Iran — Yazd (یزد)',
+	},
+	{
+		key: 'IR:KRH',
+		label: 'Iran — Kermanshah (کرمانشاه)',
+	},
+	{
+		key: 'IR:KRN',
+		label: 'Iran — Kerman (کرمان)',
+	},
+	{
+		key: 'IR:HDN',
+		label: 'Iran — Hamadan (همدان)',
+	},
+	{
+		key: 'IR:GZN',
+		label: 'Iran — Ghazvin (قزوین)',
+	},
+	{
+		key: 'IR:ZJN',
+		label: 'Iran — Zanjan (زنجان)',
+	},
+	{
+		key: 'IR:LRS',
+		label: 'Iran — Luristan (لرستان)',
+	},
+	{
+		key: 'IR:ABZ',
+		label: 'Iran — Alborz (البرز)',
+	},
+	{
+		key: 'IR:EAZ',
+		label: 'Iran — East Azarbaijan (آذربایجان شرقی)',
+	},
+	{
+		key: 'IR:WAZ',
+		label: 'Iran — West Azarbaijan (آذربایجان غربی)',
+	},
+	{
+		key: 'IR:CHB',
+		label: 'Iran — Chaharmahal and Bakhtiari (چهارمحال و بختیاری)',
+	},
+	{
+		key: 'IR:SKH',
+		label: 'Iran — South Khorasan (خراسان جنوبی)',
+	},
+	{
+		key: 'IR:RKH',
+		label: 'Iran — Razavi Khorasan (خراسان رضوی)',
+	},
+	{
+		key: 'IR:NKH',
+		label: 'Iran — North Khorasan (خراسان شمالی)',
+	},
+	{
+		key: 'IR:SMN',
+		label: 'Iran — Semnan (سمنان)',
+	},
+	{
+		key: 'IR:FRS',
+		label: 'Iran — Fars (فارس)',
+	},
+	{
+		key: 'IR:QHM',
+		label: 'Iran — Qom (قم)',
+	},
+	{
+		key: 'IR:KRD',
+		label: 'Iran — Kurdistan / کردستان)',
+	},
+	{
+		key: 'IR:KBD',
+		label: 'Iran — Kohgiluyeh and BoyerAhmad (کهگیلوییه و بویراحمد)',
+	},
+	{
+		key: 'IR:GLS',
+		label: 'Iran — Golestan (گلستان)',
+	},
+	{
+		key: 'IR:GIL',
+		label: 'Iran — Gilan (گیلان)',
+	},
+	{
+		key: 'IR:MZN',
+		label: 'Iran — Mazandaran (مازندران)',
+	},
+	{
+		key: 'IR:MKZ',
+		label: 'Iran — Markazi (مرکزی)',
+	},
+	{
+		key: 'IR:HRZ',
+		label: 'Iran — Hormozgan (هرمزگان)',
+	},
+	{
+		key: 'IR:SBN',
+		label: 'Iran — Sistan and Baluchestan (سیستان و بلوچستان)',
+	},
+	{
+		key: 'IQ',
+		label: 'Iraq',
+	},
+	{
+		key: 'IE:CW',
+		label: 'Ireland — Carlow',
+	},
+	{
+		key: 'IE:CN',
+		label: 'Ireland — Cavan',
+	},
+	{
+		key: 'IE:CE',
+		label: 'Ireland — Clare',
+	},
+	{
+		key: 'IE:CO',
+		label: 'Ireland — Cork',
+	},
+	{
+		key: 'IE:DL',
+		label: 'Ireland — Donegal',
+	},
+	{
+		key: 'IE:D',
+		label: 'Ireland — Dublin',
+	},
+	{
+		key: 'IE:G',
+		label: 'Ireland — Galway',
+	},
+	{
+		key: 'IE:KY',
+		label: 'Ireland — Kerry',
+	},
+	{
+		key: 'IE:KE',
+		label: 'Ireland — Kildare',
+	},
+	{
+		key: 'IE:KK',
+		label: 'Ireland — Kilkenny',
+	},
+	{
+		key: 'IE:LS',
+		label: 'Ireland — Laois',
+	},
+	{
+		key: 'IE:LM',
+		label: 'Ireland — Leitrim',
+	},
+	{
+		key: 'IE:LK',
+		label: 'Ireland — Limerick',
+	},
+	{
+		key: 'IE:LD',
+		label: 'Ireland — Longford',
+	},
+	{
+		key: 'IE:LH',
+		label: 'Ireland — Louth',
+	},
+	{
+		key: 'IE:MO',
+		label: 'Ireland — Mayo',
+	},
+	{
+		key: 'IE:MH',
+		label: 'Ireland — Meath',
+	},
+	{
+		key: 'IE:MN',
+		label: 'Ireland — Monaghan',
+	},
+	{
+		key: 'IE:OY',
+		label: 'Ireland — Offaly',
+	},
+	{
+		key: 'IE:RN',
+		label: 'Ireland — Roscommon',
+	},
+	{
+		key: 'IE:SO',
+		label: 'Ireland — Sligo',
+	},
+	{
+		key: 'IE:TA',
+		label: 'Ireland — Tipperary',
+	},
+	{
+		key: 'IE:WD',
+		label: 'Ireland — Waterford',
+	},
+	{
+		key: 'IE:WH',
+		label: 'Ireland — Westmeath',
+	},
+	{
+		key: 'IE:WX',
+		label: 'Ireland — Wexford',
+	},
+	{
+		key: 'IE:WW',
+		label: 'Ireland — Wicklow',
+	},
+	{
+		key: 'IM',
+		label: 'Isle of Man',
+	},
+	{
+		key: 'IL',
+		label: 'Israel',
+	},
+	{
+		key: 'IT:AG',
+		label: 'Italy — Agrigento',
+	},
+	{
+		key: 'IT:AL',
+		label: 'Italy — Alessandria',
+	},
+	{
+		key: 'IT:AN',
+		label: 'Italy — Ancona',
+	},
+	{
+		key: 'IT:AO',
+		label: 'Italy — Aosta',
+	},
+	{
+		key: 'IT:AR',
+		label: 'Italy — Arezzo',
+	},
+	{
+		key: 'IT:AP',
+		label: 'Italy — Ascoli Piceno',
+	},
+	{
+		key: 'IT:AT',
+		label: 'Italy — Asti',
+	},
+	{
+		key: 'IT:AV',
+		label: 'Italy — Avellino',
+	},
+	{
+		key: 'IT:BA',
+		label: 'Italy — Bari',
+	},
+	{
+		key: 'IT:BT',
+		label: 'Italy — Barletta-Andria-Trani',
+	},
+	{
+		key: 'IT:BL',
+		label: 'Italy — Belluno',
+	},
+	{
+		key: 'IT:BN',
+		label: 'Italy — Benevento',
+	},
+	{
+		key: 'IT:BG',
+		label: 'Italy — Bergamo',
+	},
+	{
+		key: 'IT:BI',
+		label: 'Italy — Biella',
+	},
+	{
+		key: 'IT:BO',
+		label: 'Italy — Bologna',
+	},
+	{
+		key: 'IT:BZ',
+		label: 'Italy — Bolzano',
+	},
+	{
+		key: 'IT:BS',
+		label: 'Italy — Brescia',
+	},
+	{
+		key: 'IT:BR',
+		label: 'Italy — Brindisi',
+	},
+	{
+		key: 'IT:CA',
+		label: 'Italy — Cagliari',
+	},
+	{
+		key: 'IT:CL',
+		label: 'Italy — Caltanissetta',
+	},
+	{
+		key: 'IT:CB',
+		label: 'Italy — Campobasso',
+	},
+	{
+		key: 'IT:CE',
+		label: 'Italy — Caserta',
+	},
+	{
+		key: 'IT:CT',
+		label: 'Italy — Catania',
+	},
+	{
+		key: 'IT:CZ',
+		label: 'Italy — Catanzaro',
+	},
+	{
+		key: 'IT:CH',
+		label: 'Italy — Chieti',
+	},
+	{
+		key: 'IT:CO',
+		label: 'Italy — Como',
+	},
+	{
+		key: 'IT:CS',
+		label: 'Italy — Cosenza',
+	},
+	{
+		key: 'IT:CR',
+		label: 'Italy — Cremona',
+	},
+	{
+		key: 'IT:KR',
+		label: 'Italy — Crotone',
+	},
+	{
+		key: 'IT:CN',
+		label: 'Italy — Cuneo',
+	},
+	{
+		key: 'IT:EN',
+		label: 'Italy — Enna',
+	},
+	{
+		key: 'IT:FM',
+		label: 'Italy — Fermo',
+	},
+	{
+		key: 'IT:FE',
+		label: 'Italy — Ferrara',
+	},
+	{
+		key: 'IT:FI',
+		label: 'Italy — Firenze',
+	},
+	{
+		key: 'IT:FG',
+		label: 'Italy — Foggia',
+	},
+	{
+		key: 'IT:FC',
+		label: 'Italy — Forlì-Cesena',
+	},
+	{
+		key: 'IT:FR',
+		label: 'Italy — Frosinone',
+	},
+	{
+		key: 'IT:GE',
+		label: 'Italy — Genova',
+	},
+	{
+		key: 'IT:GO',
+		label: 'Italy — Gorizia',
+	},
+	{
+		key: 'IT:GR',
+		label: 'Italy — Grosseto',
+	},
+	{
+		key: 'IT:IM',
+		label: 'Italy — Imperia',
+	},
+	{
+		key: 'IT:IS',
+		label: 'Italy — Isernia',
+	},
+	{
+		key: 'IT:SP',
+		label: 'Italy — La Spezia',
+	},
+	{
+		key: 'IT:AQ',
+		label: "Italy — L'Aquila",
+	},
+	{
+		key: 'IT:LT',
+		label: 'Italy — Latina',
+	},
+	{
+		key: 'IT:LE',
+		label: 'Italy — Lecce',
+	},
+	{
+		key: 'IT:LC',
+		label: 'Italy — Lecco',
+	},
+	{
+		key: 'IT:LI',
+		label: 'Italy — Livorno',
+	},
+	{
+		key: 'IT:LO',
+		label: 'Italy — Lodi',
+	},
+	{
+		key: 'IT:LU',
+		label: 'Italy — Lucca',
+	},
+	{
+		key: 'IT:MC',
+		label: 'Italy — Macerata',
+	},
+	{
+		key: 'IT:MN',
+		label: 'Italy — Mantova',
+	},
+	{
+		key: 'IT:MS',
+		label: 'Italy — Massa-Carrara',
+	},
+	{
+		key: 'IT:MT',
+		label: 'Italy — Matera',
+	},
+	{
+		key: 'IT:ME',
+		label: 'Italy — Messina',
+	},
+	{
+		key: 'IT:MI',
+		label: 'Italy — Milano',
+	},
+	{
+		key: 'IT:MO',
+		label: 'Italy — Modena',
+	},
+	{
+		key: 'IT:MB',
+		label: 'Italy — Monza e della Brianza',
+	},
+	{
+		key: 'IT:NA',
+		label: 'Italy — Napoli',
+	},
+	{
+		key: 'IT:NO',
+		label: 'Italy — Novara',
+	},
+	{
+		key: 'IT:NU',
+		label: 'Italy — Nuoro',
+	},
+	{
+		key: 'IT:OR',
+		label: 'Italy — Oristano',
+	},
+	{
+		key: 'IT:PD',
+		label: 'Italy — Padova',
+	},
+	{
+		key: 'IT:PA',
+		label: 'Italy — Palermo',
+	},
+	{
+		key: 'IT:PR',
+		label: 'Italy — Parma',
+	},
+	{
+		key: 'IT:PV',
+		label: 'Italy — Pavia',
+	},
+	{
+		key: 'IT:PG',
+		label: 'Italy — Perugia',
+	},
+	{
+		key: 'IT:PU',
+		label: 'Italy — Pesaro e Urbino',
+	},
+	{
+		key: 'IT:PE',
+		label: 'Italy — Pescara',
+	},
+	{
+		key: 'IT:PC',
+		label: 'Italy — Piacenza',
+	},
+	{
+		key: 'IT:PI',
+		label: 'Italy — Pisa',
+	},
+	{
+		key: 'IT:PT',
+		label: 'Italy — Pistoia',
+	},
+	{
+		key: 'IT:PN',
+		label: 'Italy — Pordenone',
+	},
+	{
+		key: 'IT:PZ',
+		label: 'Italy — Potenza',
+	},
+	{
+		key: 'IT:PO',
+		label: 'Italy — Prato',
+	},
+	{
+		key: 'IT:RG',
+		label: 'Italy — Ragusa',
+	},
+	{
+		key: 'IT:RA',
+		label: 'Italy — Ravenna',
+	},
+	{
+		key: 'IT:RC',
+		label: 'Italy — Reggio Calabria',
+	},
+	{
+		key: 'IT:RE',
+		label: 'Italy — Reggio Emilia',
+	},
+	{
+		key: 'IT:RI',
+		label: 'Italy — Rieti',
+	},
+	{
+		key: 'IT:RN',
+		label: 'Italy — Rimini',
+	},
+	{
+		key: 'IT:RM',
+		label: 'Italy — Roma',
+	},
+	{
+		key: 'IT:RO',
+		label: 'Italy — Rovigo',
+	},
+	{
+		key: 'IT:SA',
+		label: 'Italy — Salerno',
+	},
+	{
+		key: 'IT:SS',
+		label: 'Italy — Sassari',
+	},
+	{
+		key: 'IT:SV',
+		label: 'Italy — Savona',
+	},
+	{
+		key: 'IT:SI',
+		label: 'Italy — Siena',
+	},
+	{
+		key: 'IT:SR',
+		label: 'Italy — Siracusa',
+	},
+	{
+		key: 'IT:SO',
+		label: 'Italy — Sondrio',
+	},
+	{
+		key: 'IT:SU',
+		label: 'Italy — Sud Sardegna',
+	},
+	{
+		key: 'IT:TA',
+		label: 'Italy — Taranto',
+	},
+	{
+		key: 'IT:TE',
+		label: 'Italy — Teramo',
+	},
+	{
+		key: 'IT:TR',
+		label: 'Italy — Terni',
+	},
+	{
+		key: 'IT:TO',
+		label: 'Italy — Torino',
+	},
+	{
+		key: 'IT:TP',
+		label: 'Italy — Trapani',
+	},
+	{
+		key: 'IT:TN',
+		label: 'Italy — Trento',
+	},
+	{
+		key: 'IT:TV',
+		label: 'Italy — Treviso',
+	},
+	{
+		key: 'IT:TS',
+		label: 'Italy — Trieste',
+	},
+	{
+		key: 'IT:UD',
+		label: 'Italy — Udine',
+	},
+	{
+		key: 'IT:VA',
+		label: 'Italy — Varese',
+	},
+	{
+		key: 'IT:VE',
+		label: 'Italy — Venezia',
+	},
+	{
+		key: 'IT:VB',
+		label: 'Italy — Verbano-Cusio-Ossola',
+	},
+	{
+		key: 'IT:VC',
+		label: 'Italy — Vercelli',
+	},
+	{
+		key: 'IT:VR',
+		label: 'Italy — Verona',
+	},
+	{
+		key: 'IT:VV',
+		label: 'Italy — Vibo Valentia',
+	},
+	{
+		key: 'IT:VI',
+		label: 'Italy — Vicenza',
+	},
+	{
+		key: 'IT:VT',
+		label: 'Italy — Viterbo',
+	},
+	{
+		key: 'CI',
+		label: 'Ivory Coast',
+	},
+	{
+		key: 'JM:JM-01',
+		label: 'Jamaica — Kingston',
+	},
+	{
+		key: 'JM:JM-02',
+		label: 'Jamaica — Saint Andrew',
+	},
+	{
+		key: 'JM:JM-03',
+		label: 'Jamaica — Saint Thomas',
+	},
+	{
+		key: 'JM:JM-04',
+		label: 'Jamaica — Portland',
+	},
+	{
+		key: 'JM:JM-05',
+		label: 'Jamaica — Saint Mary',
+	},
+	{
+		key: 'JM:JM-06',
+		label: 'Jamaica — Saint Ann',
+	},
+	{
+		key: 'JM:JM-07',
+		label: 'Jamaica — Trelawny',
+	},
+	{
+		key: 'JM:JM-08',
+		label: 'Jamaica — Saint James',
+	},
+	{
+		key: 'JM:JM-09',
+		label: 'Jamaica — Hanover',
+	},
+	{
+		key: 'JM:JM-10',
+		label: 'Jamaica — Westmoreland',
+	},
+	{
+		key: 'JM:JM-11',
+		label: 'Jamaica — Saint Elizabeth',
+	},
+	{
+		key: 'JM:JM-12',
+		label: 'Jamaica — Manchester',
+	},
+	{
+		key: 'JM:JM-13',
+		label: 'Jamaica — Clarendon',
+	},
+	{
+		key: 'JM:JM-14',
+		label: 'Jamaica — Saint Catherine',
+	},
+	{
+		key: 'JP:JP01',
+		label: 'Japan — Hokkaido',
+	},
+	{
+		key: 'JP:JP02',
+		label: 'Japan — Aomori',
+	},
+	{
+		key: 'JP:JP03',
+		label: 'Japan — Iwate',
+	},
+	{
+		key: 'JP:JP04',
+		label: 'Japan — Miyagi',
+	},
+	{
+		key: 'JP:JP05',
+		label: 'Japan — Akita',
+	},
+	{
+		key: 'JP:JP06',
+		label: 'Japan — Yamagata',
+	},
+	{
+		key: 'JP:JP07',
+		label: 'Japan — Fukushima',
+	},
+	{
+		key: 'JP:JP08',
+		label: 'Japan — Ibaraki',
+	},
+	{
+		key: 'JP:JP09',
+		label: 'Japan — Tochigi',
+	},
+	{
+		key: 'JP:JP10',
+		label: 'Japan — Gunma',
+	},
+	{
+		key: 'JP:JP11',
+		label: 'Japan — Saitama',
+	},
+	{
+		key: 'JP:JP12',
+		label: 'Japan — Chiba',
+	},
+	{
+		key: 'JP:JP13',
+		label: 'Japan — Tokyo',
+	},
+	{
+		key: 'JP:JP14',
+		label: 'Japan — Kanagawa',
+	},
+	{
+		key: 'JP:JP15',
+		label: 'Japan — Niigata',
+	},
+	{
+		key: 'JP:JP16',
+		label: 'Japan — Toyama',
+	},
+	{
+		key: 'JP:JP17',
+		label: 'Japan — Ishikawa',
+	},
+	{
+		key: 'JP:JP18',
+		label: 'Japan — Fukui',
+	},
+	{
+		key: 'JP:JP19',
+		label: 'Japan — Yamanashi',
+	},
+	{
+		key: 'JP:JP20',
+		label: 'Japan — Nagano',
+	},
+	{
+		key: 'JP:JP21',
+		label: 'Japan — Gifu',
+	},
+	{
+		key: 'JP:JP22',
+		label: 'Japan — Shizuoka',
+	},
+	{
+		key: 'JP:JP23',
+		label: 'Japan — Aichi',
+	},
+	{
+		key: 'JP:JP24',
+		label: 'Japan — Mie',
+	},
+	{
+		key: 'JP:JP25',
+		label: 'Japan — Shiga',
+	},
+	{
+		key: 'JP:JP26',
+		label: 'Japan — Kyoto',
+	},
+	{
+		key: 'JP:JP27',
+		label: 'Japan — Osaka',
+	},
+	{
+		key: 'JP:JP28',
+		label: 'Japan — Hyogo',
+	},
+	{
+		key: 'JP:JP29',
+		label: 'Japan — Nara',
+	},
+	{
+		key: 'JP:JP30',
+		label: 'Japan — Wakayama',
+	},
+	{
+		key: 'JP:JP31',
+		label: 'Japan — Tottori',
+	},
+	{
+		key: 'JP:JP32',
+		label: 'Japan — Shimane',
+	},
+	{
+		key: 'JP:JP33',
+		label: 'Japan — Okayama',
+	},
+	{
+		key: 'JP:JP34',
+		label: 'Japan — Hiroshima',
+	},
+	{
+		key: 'JP:JP35',
+		label: 'Japan — Yamaguchi',
+	},
+	{
+		key: 'JP:JP36',
+		label: 'Japan — Tokushima',
+	},
+	{
+		key: 'JP:JP37',
+		label: 'Japan — Kagawa',
+	},
+	{
+		key: 'JP:JP38',
+		label: 'Japan — Ehime',
+	},
+	{
+		key: 'JP:JP39',
+		label: 'Japan — Kochi',
+	},
+	{
+		key: 'JP:JP40',
+		label: 'Japan — Fukuoka',
+	},
+	{
+		key: 'JP:JP41',
+		label: 'Japan — Saga',
+	},
+	{
+		key: 'JP:JP42',
+		label: 'Japan — Nagasaki',
+	},
+	{
+		key: 'JP:JP43',
+		label: 'Japan — Kumamoto',
+	},
+	{
+		key: 'JP:JP44',
+		label: 'Japan — Oita',
+	},
+	{
+		key: 'JP:JP45',
+		label: 'Japan — Miyazaki',
+	},
+	{
+		key: 'JP:JP46',
+		label: 'Japan — Kagoshima',
+	},
+	{
+		key: 'JP:JP47',
+		label: 'Japan — Okinawa',
+	},
+	{
+		key: 'JE',
+		label: 'Jersey',
+	},
+	{
+		key: 'JO',
+		label: 'Jordan',
+	},
+	{
+		key: 'KZ',
+		label: 'Kazakhstan',
+	},
+	{
+		key: 'KE:KE01',
+		label: 'Kenya — Baringo',
+	},
+	{
+		key: 'KE:KE02',
+		label: 'Kenya — Bomet',
+	},
+	{
+		key: 'KE:KE03',
+		label: 'Kenya — Bungoma',
+	},
+	{
+		key: 'KE:KE04',
+		label: 'Kenya — Busia',
+	},
+	{
+		key: 'KE:KE05',
+		label: 'Kenya — Elgeyo-Marakwet',
+	},
+	{
+		key: 'KE:KE06',
+		label: 'Kenya — Embu',
+	},
+	{
+		key: 'KE:KE07',
+		label: 'Kenya — Garissa',
+	},
+	{
+		key: 'KE:KE08',
+		label: 'Kenya — Homa Bay',
+	},
+	{
+		key: 'KE:KE09',
+		label: 'Kenya — Isiolo',
+	},
+	{
+		key: 'KE:KE10',
+		label: 'Kenya — Kajiado',
+	},
+	{
+		key: 'KE:KE11',
+		label: 'Kenya — Kakamega',
+	},
+	{
+		key: 'KE:KE12',
+		label: 'Kenya — Kericho',
+	},
+	{
+		key: 'KE:KE13',
+		label: 'Kenya — Kiambu',
+	},
+	{
+		key: 'KE:KE14',
+		label: 'Kenya — Kilifi',
+	},
+	{
+		key: 'KE:KE15',
+		label: 'Kenya — Kirinyaga',
+	},
+	{
+		key: 'KE:KE16',
+		label: 'Kenya — Kisii',
+	},
+	{
+		key: 'KE:KE17',
+		label: 'Kenya — Kisumu',
+	},
+	{
+		key: 'KE:KE18',
+		label: 'Kenya — Kitui',
+	},
+	{
+		key: 'KE:KE19',
+		label: 'Kenya — Kwale',
+	},
+	{
+		key: 'KE:KE20',
+		label: 'Kenya — Laikipia',
+	},
+	{
+		key: 'KE:KE21',
+		label: 'Kenya — Lamu',
+	},
+	{
+		key: 'KE:KE22',
+		label: 'Kenya — Machakos',
+	},
+	{
+		key: 'KE:KE23',
+		label: 'Kenya — Makueni',
+	},
+	{
+		key: 'KE:KE24',
+		label: 'Kenya — Mandera',
+	},
+	{
+		key: 'KE:KE25',
+		label: 'Kenya — Marsabit',
+	},
+	{
+		key: 'KE:KE26',
+		label: 'Kenya — Meru',
+	},
+	{
+		key: 'KE:KE27',
+		label: 'Kenya — Migori',
+	},
+	{
+		key: 'KE:KE28',
+		label: 'Kenya — Mombasa',
+	},
+	{
+		key: 'KE:KE29',
+		label: 'Kenya — Murang’a',
+	},
+	{
+		key: 'KE:KE30',
+		label: 'Kenya — Nairobi County',
+	},
+	{
+		key: 'KE:KE31',
+		label: 'Kenya — Nakuru',
+	},
+	{
+		key: 'KE:KE32',
+		label: 'Kenya — Nandi',
+	},
+	{
+		key: 'KE:KE33',
+		label: 'Kenya — Narok',
+	},
+	{
+		key: 'KE:KE34',
+		label: 'Kenya — Nyamira',
+	},
+	{
+		key: 'KE:KE35',
+		label: 'Kenya — Nyandarua',
+	},
+	{
+		key: 'KE:KE36',
+		label: 'Kenya — Nyeri',
+	},
+	{
+		key: 'KE:KE37',
+		label: 'Kenya — Samburu',
+	},
+	{
+		key: 'KE:KE38',
+		label: 'Kenya — Siaya',
+	},
+	{
+		key: 'KE:KE39',
+		label: 'Kenya — Taita-Taveta',
+	},
+	{
+		key: 'KE:KE40',
+		label: 'Kenya — Tana River',
+	},
+	{
+		key: 'KE:KE41',
+		label: 'Kenya — Tharaka-Nithi',
+	},
+	{
+		key: 'KE:KE42',
+		label: 'Kenya — Trans Nzoia',
+	},
+	{
+		key: 'KE:KE43',
+		label: 'Kenya — Turkana',
+	},
+	{
+		key: 'KE:KE44',
+		label: 'Kenya — Uasin Gishu',
+	},
+	{
+		key: 'KE:KE45',
+		label: 'Kenya — Vihiga',
+	},
+	{
+		key: 'KE:KE46',
+		label: 'Kenya — Wajir',
+	},
+	{
+		key: 'KE:KE47',
+		label: 'Kenya — West Pokot',
+	},
+	{
+		key: 'KI',
+		label: 'Kiribati',
+	},
+	{
+		key: 'KW',
+		label: 'Kuwait',
+	},
+	{
+		key: 'KG',
+		label: 'Kyrgyzstan',
+	},
+	{
+		key: 'LA:AT',
+		label: 'Laos — Attapeu',
+	},
+	{
+		key: 'LA:BK',
+		label: 'Laos — Bokeo',
+	},
+	{
+		key: 'LA:BL',
+		label: 'Laos — Bolikhamsai',
+	},
+	{
+		key: 'LA:CH',
+		label: 'Laos — Champasak',
+	},
+	{
+		key: 'LA:HO',
+		label: 'Laos — Houaphanh',
+	},
+	{
+		key: 'LA:KH',
+		label: 'Laos — Khammouane',
+	},
+	{
+		key: 'LA:LM',
+		label: 'Laos — Luang Namtha',
+	},
+	{
+		key: 'LA:LP',
+		label: 'Laos — Luang Prabang',
+	},
+	{
+		key: 'LA:OU',
+		label: 'Laos — Oudomxay',
+	},
+	{
+		key: 'LA:PH',
+		label: 'Laos — Phongsaly',
+	},
+	{
+		key: 'LA:SL',
+		label: 'Laos — Salavan',
+	},
+	{
+		key: 'LA:SV',
+		label: 'Laos — Savannakhet',
+	},
+	{
+		key: 'LA:VI',
+		label: 'Laos — Vientiane Province',
+	},
+	{
+		key: 'LA:VT',
+		label: 'Laos — Vientiane',
+	},
+	{
+		key: 'LA:XA',
+		label: 'Laos — Sainyabuli',
+	},
+	{
+		key: 'LA:XE',
+		label: 'Laos — Sekong',
+	},
+	{
+		key: 'LA:XI',
+		label: 'Laos — Xiangkhouang',
+	},
+	{
+		key: 'LA:XS',
+		label: 'Laos — Xaisomboun',
+	},
+	{
+		key: 'LV',
+		label: 'Latvia',
+	},
+	{
+		key: 'LB',
+		label: 'Lebanon',
+	},
+	{
+		key: 'LS',
+		label: 'Lesotho',
+	},
+	{
+		key: 'LR:BM',
+		label: 'Liberia — Bomi',
+	},
+	{
+		key: 'LR:BN',
+		label: 'Liberia — Bong',
+	},
+	{
+		key: 'LR:GA',
+		label: 'Liberia — Gbarpolu',
+	},
+	{
+		key: 'LR:GB',
+		label: 'Liberia — Grand Bassa',
+	},
+	{
+		key: 'LR:GC',
+		label: 'Liberia — Grand Cape Mount',
+	},
+	{
+		key: 'LR:GG',
+		label: 'Liberia — Grand Gedeh',
+	},
+	{
+		key: 'LR:GK',
+		label: 'Liberia — Grand Kru',
+	},
+	{
+		key: 'LR:LO',
+		label: 'Liberia — Lofa',
+	},
+	{
+		key: 'LR:MA',
+		label: 'Liberia — Margibi',
+	},
+	{
+		key: 'LR:MY',
+		label: 'Liberia — Maryland',
+	},
+	{
+		key: 'LR:MO',
+		label: 'Liberia — Montserrado',
+	},
+	{
+		key: 'LR:NM',
+		label: 'Liberia — Nimba',
+	},
+	{
+		key: 'LR:RV',
+		label: 'Liberia — Rivercess',
+	},
+	{
+		key: 'LR:RG',
+		label: 'Liberia — River Gee',
+	},
+	{
+		key: 'LR:SN',
+		label: 'Liberia — Sinoe',
+	},
+	{
+		key: 'LY',
+		label: 'Libya',
+	},
+	{
+		key: 'LI',
+		label: 'Liechtenstein',
+	},
+	{
+		key: 'LT',
+		label: 'Lithuania',
+	},
+	{
+		key: 'LU',
+		label: 'Luxembourg',
+	},
+	{
+		key: 'MO',
+		label: 'Macao',
+	},
+	{
+		key: 'MG',
+		label: 'Madagascar',
+	},
+	{
+		key: 'MW',
+		label: 'Malawi',
+	},
+	{
+		key: 'MY:JHR',
+		label: 'Malaysia — Johor',
+	},
+	{
+		key: 'MY:KDH',
+		label: 'Malaysia — Kedah',
+	},
+	{
+		key: 'MY:KTN',
+		label: 'Malaysia — Kelantan',
+	},
+	{
+		key: 'MY:LBN',
+		label: 'Malaysia — Labuan',
+	},
+	{
+		key: 'MY:MLK',
+		label: 'Malaysia — Malacca (Melaka)',
+	},
+	{
+		key: 'MY:NSN',
+		label: 'Malaysia — Negeri Sembilan',
+	},
+	{
+		key: 'MY:PHG',
+		label: 'Malaysia — Pahang',
+	},
+	{
+		key: 'MY:PNG',
+		label: 'Malaysia — Penang (Pulau Pinang)',
+	},
+	{
+		key: 'MY:PRK',
+		label: 'Malaysia — Perak',
+	},
+	{
+		key: 'MY:PLS',
+		label: 'Malaysia — Perlis',
+	},
+	{
+		key: 'MY:SBH',
+		label: 'Malaysia — Sabah',
+	},
+	{
+		key: 'MY:SWK',
+		label: 'Malaysia — Sarawak',
+	},
+	{
+		key: 'MY:SGR',
+		label: 'Malaysia — Selangor',
+	},
+	{
+		key: 'MY:TRG',
+		label: 'Malaysia — Terengganu',
+	},
+	{
+		key: 'MY:PJY',
+		label: 'Malaysia — Putrajaya',
+	},
+	{
+		key: 'MY:KUL',
+		label: 'Malaysia — Kuala Lumpur',
+	},
+	{
+		key: 'MV',
+		label: 'Maldives',
+	},
+	{
+		key: 'ML',
+		label: 'Mali',
+	},
+	{
+		key: 'MT',
+		label: 'Malta',
+	},
+	{
+		key: 'MH',
+		label: 'Marshall Islands',
+	},
+	{
+		key: 'MQ',
+		label: 'Martinique',
+	},
+	{
+		key: 'MR',
+		label: 'Mauritania',
+	},
+	{
+		key: 'MU',
+		label: 'Mauritius',
+	},
+	{
+		key: 'YT',
+		label: 'Mayotte',
+	},
+	{
+		key: 'MX:DF',
+		label: 'Mexico — Ciudad de México',
+	},
+	{
+		key: 'MX:JA',
+		label: 'Mexico — Jalisco',
+	},
+	{
+		key: 'MX:NL',
+		label: 'Mexico — Nuevo León',
+	},
+	{
+		key: 'MX:AG',
+		label: 'Mexico — Aguascalientes',
+	},
+	{
+		key: 'MX:BC',
+		label: 'Mexico — Baja California',
+	},
+	{
+		key: 'MX:BS',
+		label: 'Mexico — Baja California Sur',
+	},
+	{
+		key: 'MX:CM',
+		label: 'Mexico — Campeche',
+	},
+	{
+		key: 'MX:CS',
+		label: 'Mexico — Chiapas',
+	},
+	{
+		key: 'MX:CH',
+		label: 'Mexico — Chihuahua',
+	},
+	{
+		key: 'MX:CO',
+		label: 'Mexico — Coahuila',
+	},
+	{
+		key: 'MX:CL',
+		label: 'Mexico — Colima',
+	},
+	{
+		key: 'MX:DG',
+		label: 'Mexico — Durango',
+	},
+	{
+		key: 'MX:GT',
+		label: 'Mexico — Guanajuato',
+	},
+	{
+		key: 'MX:GR',
+		label: 'Mexico — Guerrero',
+	},
+	{
+		key: 'MX:HG',
+		label: 'Mexico — Hidalgo',
+	},
+	{
+		key: 'MX:MX',
+		label: 'Mexico — Estado de México',
+	},
+	{
+		key: 'MX:MI',
+		label: 'Mexico — Michoacán',
+	},
+	{
+		key: 'MX:MO',
+		label: 'Mexico — Morelos',
+	},
+	{
+		key: 'MX:NA',
+		label: 'Mexico — Nayarit',
+	},
+	{
+		key: 'MX:OA',
+		label: 'Mexico — Oaxaca',
+	},
+	{
+		key: 'MX:PU',
+		label: 'Mexico — Puebla',
+	},
+	{
+		key: 'MX:QT',
+		label: 'Mexico — Querétaro',
+	},
+	{
+		key: 'MX:QR',
+		label: 'Mexico — Quintana Roo',
+	},
+	{
+		key: 'MX:SL',
+		label: 'Mexico — San Luis Potosí',
+	},
+	{
+		key: 'MX:SI',
+		label: 'Mexico — Sinaloa',
+	},
+	{
+		key: 'MX:SO',
+		label: 'Mexico — Sonora',
+	},
+	{
+		key: 'MX:TB',
+		label: 'Mexico — Tabasco',
+	},
+	{
+		key: 'MX:TM',
+		label: 'Mexico — Tamaulipas',
+	},
+	{
+		key: 'MX:TL',
+		label: 'Mexico — Tlaxcala',
+	},
+	{
+		key: 'MX:VE',
+		label: 'Mexico — Veracruz',
+	},
+	{
+		key: 'MX:YU',
+		label: 'Mexico — Yucatán',
+	},
+	{
+		key: 'MX:ZA',
+		label: 'Mexico — Zacatecas',
+	},
+	{
+		key: 'FM',
+		label: 'Micronesia',
+	},
+	{
+		key: 'MD:C',
+		label: 'Moldova — Chișinău',
+	},
+	{
+		key: 'MD:BL',
+		label: 'Moldova — Bălți',
+	},
+	{
+		key: 'MD:AN',
+		label: 'Moldova — Anenii Noi',
+	},
+	{
+		key: 'MD:BS',
+		label: 'Moldova — Basarabeasca',
+	},
+	{
+		key: 'MD:BR',
+		label: 'Moldova — Briceni',
+	},
+	{
+		key: 'MD:CH',
+		label: 'Moldova — Cahul',
+	},
+	{
+		key: 'MD:CT',
+		label: 'Moldova — Cantemir',
+	},
+	{
+		key: 'MD:CL',
+		label: 'Moldova — Călărași',
+	},
+	{
+		key: 'MD:CS',
+		label: 'Moldova — Căușeni',
+	},
+	{
+		key: 'MD:CM',
+		label: 'Moldova — Cimișlia',
+	},
+	{
+		key: 'MD:CR',
+		label: 'Moldova — Criuleni',
+	},
+	{
+		key: 'MD:DN',
+		label: 'Moldova — Dondușeni',
+	},
+	{
+		key: 'MD:DR',
+		label: 'Moldova — Drochia',
+	},
+	{
+		key: 'MD:DB',
+		label: 'Moldova — Dubăsari',
+	},
+	{
+		key: 'MD:ED',
+		label: 'Moldova — Edineț',
+	},
+	{
+		key: 'MD:FL',
+		label: 'Moldova — Fălești',
+	},
+	{
+		key: 'MD:FR',
+		label: 'Moldova — Florești',
+	},
+	{
+		key: 'MD:GE',
+		label: 'Moldova — UTA Găgăuzia',
+	},
+	{
+		key: 'MD:GL',
+		label: 'Moldova — Glodeni',
+	},
+	{
+		key: 'MD:HN',
+		label: 'Moldova — Hîncești',
+	},
+	{
+		key: 'MD:IL',
+		label: 'Moldova — Ialoveni',
+	},
+	{
+		key: 'MD:LV',
+		label: 'Moldova — Leova',
+	},
+	{
+		key: 'MD:NS',
+		label: 'Moldova — Nisporeni',
+	},
+	{
+		key: 'MD:OC',
+		label: 'Moldova — Ocnița',
+	},
+	{
+		key: 'MD:OR',
+		label: 'Moldova — Orhei',
+	},
+	{
+		key: 'MD:RZ',
+		label: 'Moldova — Rezina',
+	},
+	{
+		key: 'MD:RS',
+		label: 'Moldova — Rîșcani',
+	},
+	{
+		key: 'MD:SG',
+		label: 'Moldova — Sîngerei',
+	},
+	{
+		key: 'MD:SR',
+		label: 'Moldova — Soroca',
+	},
+	{
+		key: 'MD:ST',
+		label: 'Moldova — Strășeni',
+	},
+	{
+		key: 'MD:SD',
+		label: 'Moldova — Șoldănești',
+	},
+	{
+		key: 'MD:SV',
+		label: 'Moldova — Ștefan Vodă',
+	},
+	{
+		key: 'MD:TR',
+		label: 'Moldova — Taraclia',
+	},
+	{
+		key: 'MD:TL',
+		label: 'Moldova — Telenești',
+	},
+	{
+		key: 'MD:UN',
+		label: 'Moldova — Ungheni',
+	},
+	{
+		key: 'MC',
+		label: 'Monaco',
+	},
+	{
+		key: 'MN',
+		label: 'Mongolia',
+	},
+	{
+		key: 'ME',
+		label: 'Montenegro',
+	},
+	{
+		key: 'MS',
+		label: 'Montserrat',
+	},
+	{
+		key: 'MA',
+		label: 'Morocco',
+	},
+	{
+		key: 'MZ:MZP',
+		label: 'Mozambique — Cabo Delgado',
+	},
+	{
+		key: 'MZ:MZG',
+		label: 'Mozambique — Gaza',
+	},
+	{
+		key: 'MZ:MZI',
+		label: 'Mozambique — Inhambane',
+	},
+	{
+		key: 'MZ:MZB',
+		label: 'Mozambique — Manica',
+	},
+	{
+		key: 'MZ:MZL',
+		label: 'Mozambique — Maputo Province',
+	},
+	{
+		key: 'MZ:MZMPM',
+		label: 'Mozambique — Maputo',
+	},
+	{
+		key: 'MZ:MZN',
+		label: 'Mozambique — Nampula',
+	},
+	{
+		key: 'MZ:MZA',
+		label: 'Mozambique — Niassa',
+	},
+	{
+		key: 'MZ:MZS',
+		label: 'Mozambique — Sofala',
+	},
+	{
+		key: 'MZ:MZT',
+		label: 'Mozambique — Tete',
+	},
+	{
+		key: 'MZ:MZQ',
+		label: 'Mozambique — Zambézia',
+	},
+	{
+		key: 'MM',
+		label: 'Myanmar',
+	},
+	{
+		key: 'NA:ER',
+		label: 'Namibia — Erongo',
+	},
+	{
+		key: 'NA:HA',
+		label: 'Namibia — Hardap',
+	},
+	{
+		key: 'NA:KA',
+		label: 'Namibia — Karas',
+	},
+	{
+		key: 'NA:KE',
+		label: 'Namibia — Kavango East',
+	},
+	{
+		key: 'NA:KW',
+		label: 'Namibia — Kavango West',
+	},
+	{
+		key: 'NA:KH',
+		label: 'Namibia — Khomas',
+	},
+	{
+		key: 'NA:KU',
+		label: 'Namibia — Kunene',
+	},
+	{
+		key: 'NA:OW',
+		label: 'Namibia — Ohangwena',
+	},
+	{
+		key: 'NA:OH',
+		label: 'Namibia — Omaheke',
+	},
+	{
+		key: 'NA:OS',
+		label: 'Namibia — Omusati',
+	},
+	{
+		key: 'NA:ON',
+		label: 'Namibia — Oshana',
+	},
+	{
+		key: 'NA:OT',
+		label: 'Namibia — Oshikoto',
+	},
+	{
+		key: 'NA:OD',
+		label: 'Namibia — Otjozondjupa',
+	},
+	{
+		key: 'NA:CA',
+		label: 'Namibia — Zambezi',
+	},
+	{
+		key: 'NR',
+		label: 'Nauru',
+	},
+	{
+		key: 'NP:BAG',
+		label: 'Nepal — Bagmati',
+	},
+	{
+		key: 'NP:BHE',
+		label: 'Nepal — Bheri',
+	},
+	{
+		key: 'NP:DHA',
+		label: 'Nepal — Dhaulagiri',
+	},
+	{
+		key: 'NP:GAN',
+		label: 'Nepal — Gandaki',
+	},
+	{
+		key: 'NP:JAN',
+		label: 'Nepal — Janakpur',
+	},
+	{
+		key: 'NP:KAR',
+		label: 'Nepal — Karnali',
+	},
+	{
+		key: 'NP:KOS',
+		label: 'Nepal — Koshi',
+	},
+	{
+		key: 'NP:LUM',
+		label: 'Nepal — Lumbini',
+	},
+	{
+		key: 'NP:MAH',
+		label: 'Nepal — Mahakali',
+	},
+	{
+		key: 'NP:MEC',
+		label: 'Nepal — Mechi',
+	},
+	{
+		key: 'NP:NAR',
+		label: 'Nepal — Narayani',
+	},
+	{
+		key: 'NP:RAP',
+		label: 'Nepal — Rapti',
+	},
+	{
+		key: 'NP:SAG',
+		label: 'Nepal — Sagarmatha',
+	},
+	{
+		key: 'NP:SET',
+		label: 'Nepal — Seti',
+	},
+	{
+		key: 'NL',
+		label: 'Netherlands',
+	},
+	{
+		key: 'NC',
+		label: 'New Caledonia',
+	},
+	{
+		key: 'NZ:NTL',
+		label: 'New Zealand — Northland',
+	},
+	{
+		key: 'NZ:AUK',
+		label: 'New Zealand — Auckland',
+	},
+	{
+		key: 'NZ:WKO',
+		label: 'New Zealand — Waikato',
+	},
+	{
+		key: 'NZ:BOP',
+		label: 'New Zealand — Bay of Plenty',
+	},
+	{
+		key: 'NZ:TKI',
+		label: 'New Zealand — Taranaki',
+	},
+	{
+		key: 'NZ:GIS',
+		label: 'New Zealand — Gisborne',
+	},
+	{
+		key: 'NZ:HKB',
+		label: 'New Zealand — Hawke’s Bay',
+	},
+	{
+		key: 'NZ:MWT',
+		label: 'New Zealand — Manawatu-Wanganui',
+	},
+	{
+		key: 'NZ:WGN',
+		label: 'New Zealand — Wellington',
+	},
+	{
+		key: 'NZ:NSN',
+		label: 'New Zealand — Nelson',
+	},
+	{
+		key: 'NZ:MBH',
+		label: 'New Zealand — Marlborough',
+	},
+	{
+		key: 'NZ:TAS',
+		label: 'New Zealand — Tasman',
+	},
+	{
+		key: 'NZ:WTC',
+		label: 'New Zealand — West Coast',
+	},
+	{
+		key: 'NZ:CAN',
+		label: 'New Zealand — Canterbury',
+	},
+	{
+		key: 'NZ:OTA',
+		label: 'New Zealand — Otago',
+	},
+	{
+		key: 'NZ:STL',
+		label: 'New Zealand — Southland',
+	},
+	{
+		key: 'NI:NI-AN',
+		label: 'Nicaragua — Atlántico Norte',
+	},
+	{
+		key: 'NI:NI-AS',
+		label: 'Nicaragua — Atlántico Sur',
+	},
+	{
+		key: 'NI:NI-BO',
+		label: 'Nicaragua — Boaco',
+	},
+	{
+		key: 'NI:NI-CA',
+		label: 'Nicaragua — Carazo',
+	},
+	{
+		key: 'NI:NI-CI',
+		label: 'Nicaragua — Chinandega',
+	},
+	{
+		key: 'NI:NI-CO',
+		label: 'Nicaragua — Chontales',
+	},
+	{
+		key: 'NI:NI-ES',
+		label: 'Nicaragua — Estelí',
+	},
+	{
+		key: 'NI:NI-GR',
+		label: 'Nicaragua — Granada',
+	},
+	{
+		key: 'NI:NI-JI',
+		label: 'Nicaragua — Jinotega',
+	},
+	{
+		key: 'NI:NI-LE',
+		label: 'Nicaragua — León',
+	},
+	{
+		key: 'NI:NI-MD',
+		label: 'Nicaragua — Madriz',
+	},
+	{
+		key: 'NI:NI-MN',
+		label: 'Nicaragua — Managua',
+	},
+	{
+		key: 'NI:NI-MS',
+		label: 'Nicaragua — Masaya',
+	},
+	{
+		key: 'NI:NI-MT',
+		label: 'Nicaragua — Matagalpa',
+	},
+	{
+		key: 'NI:NI-NS',
+		label: 'Nicaragua — Nueva Segovia',
+	},
+	{
+		key: 'NI:NI-RI',
+		label: 'Nicaragua — Rivas',
+	},
+	{
+		key: 'NI:NI-SJ',
+		label: 'Nicaragua — Río San Juan',
+	},
+	{
+		key: 'NE',
+		label: 'Niger',
+	},
+	{
+		key: 'NG:AB',
+		label: 'Nigeria — Abia',
+	},
+	{
+		key: 'NG:FC',
+		label: 'Nigeria — Abuja',
+	},
+	{
+		key: 'NG:AD',
+		label: 'Nigeria — Adamawa',
+	},
+	{
+		key: 'NG:AK',
+		label: 'Nigeria — Akwa Ibom',
+	},
+	{
+		key: 'NG:AN',
+		label: 'Nigeria — Anambra',
+	},
+	{
+		key: 'NG:BA',
+		label: 'Nigeria — Bauchi',
+	},
+	{
+		key: 'NG:BY',
+		label: 'Nigeria — Bayelsa',
+	},
+	{
+		key: 'NG:BE',
+		label: 'Nigeria — Benue',
+	},
+	{
+		key: 'NG:BO',
+		label: 'Nigeria — Borno',
+	},
+	{
+		key: 'NG:CR',
+		label: 'Nigeria — Cross River',
+	},
+	{
+		key: 'NG:DE',
+		label: 'Nigeria — Delta',
+	},
+	{
+		key: 'NG:EB',
+		label: 'Nigeria — Ebonyi',
+	},
+	{
+		key: 'NG:ED',
+		label: 'Nigeria — Edo',
+	},
+	{
+		key: 'NG:EK',
+		label: 'Nigeria — Ekiti',
+	},
+	{
+		key: 'NG:EN',
+		label: 'Nigeria — Enugu',
+	},
+	{
+		key: 'NG:GO',
+		label: 'Nigeria — Gombe',
+	},
+	{
+		key: 'NG:IM',
+		label: 'Nigeria — Imo',
+	},
+	{
+		key: 'NG:JI',
+		label: 'Nigeria — Jigawa',
+	},
+	{
+		key: 'NG:KD',
+		label: 'Nigeria — Kaduna',
+	},
+	{
+		key: 'NG:KN',
+		label: 'Nigeria — Kano',
+	},
+	{
+		key: 'NG:KT',
+		label: 'Nigeria — Katsina',
+	},
+	{
+		key: 'NG:KE',
+		label: 'Nigeria — Kebbi',
+	},
+	{
+		key: 'NG:KO',
+		label: 'Nigeria — Kogi',
+	},
+	{
+		key: 'NG:KW',
+		label: 'Nigeria — Kwara',
+	},
+	{
+		key: 'NG:LA',
+		label: 'Nigeria — Lagos',
+	},
+	{
+		key: 'NG:NA',
+		label: 'Nigeria — Nasarawa',
+	},
+	{
+		key: 'NG:NI',
+		label: 'Nigeria — Niger',
+	},
+	{
+		key: 'NG:OG',
+		label: 'Nigeria — Ogun',
+	},
+	{
+		key: 'NG:ON',
+		label: 'Nigeria — Ondo',
+	},
+	{
+		key: 'NG:OS',
+		label: 'Nigeria — Osun',
+	},
+	{
+		key: 'NG:OY',
+		label: 'Nigeria — Oyo',
+	},
+	{
+		key: 'NG:PL',
+		label: 'Nigeria — Plateau',
+	},
+	{
+		key: 'NG:RI',
+		label: 'Nigeria — Rivers',
+	},
+	{
+		key: 'NG:SO',
+		label: 'Nigeria — Sokoto',
+	},
+	{
+		key: 'NG:TA',
+		label: 'Nigeria — Taraba',
+	},
+	{
+		key: 'NG:YO',
+		label: 'Nigeria — Yobe',
+	},
+	{
+		key: 'NG:ZA',
+		label: 'Nigeria — Zamfara',
+	},
+	{
+		key: 'NU',
+		label: 'Niue',
+	},
+	{
+		key: 'NF',
+		label: 'Norfolk Island',
+	},
+	{
+		key: 'KP',
+		label: 'North Korea',
+	},
+	{
+		key: 'MK',
+		label: 'North Macedonia',
+	},
+	{
+		key: 'MP',
+		label: 'Northern Mariana Islands',
+	},
+	{
+		key: 'NO',
+		label: 'Norway',
+	},
+	{
+		key: 'OM',
+		label: 'Oman',
+	},
+	{
+		key: 'PK:JK',
+		label: 'Pakistan — Azad Kashmir',
+	},
+	{
+		key: 'PK:BA',
+		label: 'Pakistan — Balochistan',
+	},
+	{
+		key: 'PK:TA',
+		label: 'Pakistan — FATA',
+	},
+	{
+		key: 'PK:GB',
+		label: 'Pakistan — Gilgit Baltistan',
+	},
+	{
+		key: 'PK:IS',
+		label: 'Pakistan — Islamabad Capital Territory',
+	},
+	{
+		key: 'PK:KP',
+		label: 'Pakistan — Khyber Pakhtunkhwa',
+	},
+	{
+		key: 'PK:PB',
+		label: 'Pakistan — Punjab',
+	},
+	{
+		key: 'PK:SD',
+		label: 'Pakistan — Sindh',
+	},
+	{
+		key: 'PS',
+		label: 'Palestinian Territory',
+	},
+	{
+		key: 'PA:PA-1',
+		label: 'Panama — Bocas del Toro',
+	},
+	{
+		key: 'PA:PA-2',
+		label: 'Panama — Coclé',
+	},
+	{
+		key: 'PA:PA-3',
+		label: 'Panama — Colón',
+	},
+	{
+		key: 'PA:PA-4',
+		label: 'Panama — Chiriquí',
+	},
+	{
+		key: 'PA:PA-5',
+		label: 'Panama — Darién',
+	},
+	{
+		key: 'PA:PA-6',
+		label: 'Panama — Herrera',
+	},
+	{
+		key: 'PA:PA-7',
+		label: 'Panama — Los Santos',
+	},
+	{
+		key: 'PA:PA-8',
+		label: 'Panama — Panamá',
+	},
+	{
+		key: 'PA:PA-9',
+		label: 'Panama — Veraguas',
+	},
+	{
+		key: 'PA:PA-10',
+		label: 'Panama — West Panamá',
+	},
+	{
+		key: 'PA:PA-EM',
+		label: 'Panama — Emberá',
+	},
+	{
+		key: 'PA:PA-KY',
+		label: 'Panama — Guna Yala',
+	},
+	{
+		key: 'PA:PA-NB',
+		label: 'Panama — Ngöbe-Buglé',
+	},
+	{
+		key: 'PG',
+		label: 'Papua New Guinea',
+	},
+	{
+		key: 'PY:PY-ASU',
+		label: 'Paraguay — Asunción',
+	},
+	{
+		key: 'PY:PY-1',
+		label: 'Paraguay — Concepción',
+	},
+	{
+		key: 'PY:PY-2',
+		label: 'Paraguay — San Pedro',
+	},
+	{
+		key: 'PY:PY-3',
+		label: 'Paraguay — Cordillera',
+	},
+	{
+		key: 'PY:PY-4',
+		label: 'Paraguay — Guairá',
+	},
+	{
+		key: 'PY:PY-5',
+		label: 'Paraguay — Caaguazú',
+	},
+	{
+		key: 'PY:PY-6',
+		label: 'Paraguay — Caazapá',
+	},
+	{
+		key: 'PY:PY-7',
+		label: 'Paraguay — Itapúa',
+	},
+	{
+		key: 'PY:PY-8',
+		label: 'Paraguay — Misiones',
+	},
+	{
+		key: 'PY:PY-9',
+		label: 'Paraguay — Paraguarí',
+	},
+	{
+		key: 'PY:PY-10',
+		label: 'Paraguay — Alto Paraná',
+	},
+	{
+		key: 'PY:PY-11',
+		label: 'Paraguay — Central',
+	},
+	{
+		key: 'PY:PY-12',
+		label: 'Paraguay — Ñeembucú',
+	},
+	{
+		key: 'PY:PY-13',
+		label: 'Paraguay — Amambay',
+	},
+	{
+		key: 'PY:PY-14',
+		label: 'Paraguay — Canindeyú',
+	},
+	{
+		key: 'PY:PY-15',
+		label: 'Paraguay — Presidente Hayes',
+	},
+	{
+		key: 'PY:PY-16',
+		label: 'Paraguay — Alto Paraguay',
+	},
+	{
+		key: 'PY:PY-17',
+		label: 'Paraguay — Boquerón',
+	},
+	{
+		key: 'PE:CAL',
+		label: 'Peru — El Callao',
+	},
+	{
+		key: 'PE:LMA',
+		label: 'Peru — Municipalidad Metropolitana de Lima',
+	},
+	{
+		key: 'PE:AMA',
+		label: 'Peru — Amazonas',
+	},
+	{
+		key: 'PE:ANC',
+		label: 'Peru — Ancash',
+	},
+	{
+		key: 'PE:APU',
+		label: 'Peru — Apurímac',
+	},
+	{
+		key: 'PE:ARE',
+		label: 'Peru — Arequipa',
+	},
+	{
+		key: 'PE:AYA',
+		label: 'Peru — Ayacucho',
+	},
+	{
+		key: 'PE:CAJ',
+		label: 'Peru — Cajamarca',
+	},
+	{
+		key: 'PE:CUS',
+		label: 'Peru — Cusco',
+	},
+	{
+		key: 'PE:HUV',
+		label: 'Peru — Huancavelica',
+	},
+	{
+		key: 'PE:HUC',
+		label: 'Peru — Huánuco',
+	},
+	{
+		key: 'PE:ICA',
+		label: 'Peru — Ica',
+	},
+	{
+		key: 'PE:JUN',
+		label: 'Peru — Junín',
+	},
+	{
+		key: 'PE:LAL',
+		label: 'Peru — La Libertad',
+	},
+	{
+		key: 'PE:LAM',
+		label: 'Peru — Lambayeque',
+	},
+	{
+		key: 'PE:LIM',
+		label: 'Peru — Lima',
+	},
+	{
+		key: 'PE:LOR',
+		label: 'Peru — Loreto',
+	},
+	{
+		key: 'PE:MDD',
+		label: 'Peru — Madre de Dios',
+	},
+	{
+		key: 'PE:MOQ',
+		label: 'Peru — Moquegua',
+	},
+	{
+		key: 'PE:PAS',
+		label: 'Peru — Pasco',
+	},
+	{
+		key: 'PE:PIU',
+		label: 'Peru — Piura',
+	},
+	{
+		key: 'PE:PUN',
+		label: 'Peru — Puno',
+	},
+	{
+		key: 'PE:SAM',
+		label: 'Peru — San Martín',
+	},
+	{
+		key: 'PE:TAC',
+		label: 'Peru — Tacna',
+	},
+	{
+		key: 'PE:TUM',
+		label: 'Peru — Tumbes',
+	},
+	{
+		key: 'PE:UCA',
+		label: 'Peru — Ucayali',
+	},
+	{
+		key: 'PH:ABR',
+		label: 'Philippines — Abra',
+	},
+	{
+		key: 'PH:AGN',
+		label: 'Philippines — Agusan del Norte',
+	},
+	{
+		key: 'PH:AGS',
+		label: 'Philippines — Agusan del Sur',
+	},
+	{
+		key: 'PH:AKL',
+		label: 'Philippines — Aklan',
+	},
+	{
+		key: 'PH:ALB',
+		label: 'Philippines — Albay',
+	},
+	{
+		key: 'PH:ANT',
+		label: 'Philippines — Antique',
+	},
+	{
+		key: 'PH:APA',
+		label: 'Philippines — Apayao',
+	},
+	{
+		key: 'PH:AUR',
+		label: 'Philippines — Aurora',
+	},
+	{
+		key: 'PH:BAS',
+		label: 'Philippines — Basilan',
+	},
+	{
+		key: 'PH:BAN',
+		label: 'Philippines — Bataan',
+	},
+	{
+		key: 'PH:BTN',
+		label: 'Philippines — Batanes',
+	},
+	{
+		key: 'PH:BTG',
+		label: 'Philippines — Batangas',
+	},
+	{
+		key: 'PH:BEN',
+		label: 'Philippines — Benguet',
+	},
+	{
+		key: 'PH:BIL',
+		label: 'Philippines — Biliran',
+	},
+	{
+		key: 'PH:BOH',
+		label: 'Philippines — Bohol',
+	},
+	{
+		key: 'PH:BUK',
+		label: 'Philippines — Bukidnon',
+	},
+	{
+		key: 'PH:BUL',
+		label: 'Philippines — Bulacan',
+	},
+	{
+		key: 'PH:CAG',
+		label: 'Philippines — Cagayan',
+	},
+	{
+		key: 'PH:CAN',
+		label: 'Philippines — Camarines Norte',
+	},
+	{
+		key: 'PH:CAS',
+		label: 'Philippines — Camarines Sur',
+	},
+	{
+		key: 'PH:CAM',
+		label: 'Philippines — Camiguin',
+	},
+	{
+		key: 'PH:CAP',
+		label: 'Philippines — Capiz',
+	},
+	{
+		key: 'PH:CAT',
+		label: 'Philippines — Catanduanes',
+	},
+	{
+		key: 'PH:CAV',
+		label: 'Philippines — Cavite',
+	},
+	{
+		key: 'PH:CEB',
+		label: 'Philippines — Cebu',
+	},
+	{
+		key: 'PH:COM',
+		label: 'Philippines — Compostela Valley',
+	},
+	{
+		key: 'PH:NCO',
+		label: 'Philippines — Cotabato',
+	},
+	{
+		key: 'PH:DAV',
+		label: 'Philippines — Davao del Norte',
+	},
+	{
+		key: 'PH:DAS',
+		label: 'Philippines — Davao del Sur',
+	},
+	{
+		key: 'PH:DAC',
+		label: 'Philippines — Davao Occidental',
+	},
+	{
+		key: 'PH:DAO',
+		label: 'Philippines — Davao Oriental',
+	},
+	{
+		key: 'PH:DIN',
+		label: 'Philippines — Dinagat Islands',
+	},
+	{
+		key: 'PH:EAS',
+		label: 'Philippines — Eastern Samar',
+	},
+	{
+		key: 'PH:GUI',
+		label: 'Philippines — Guimaras',
+	},
+	{
+		key: 'PH:IFU',
+		label: 'Philippines — Ifugao',
+	},
+	{
+		key: 'PH:ILN',
+		label: 'Philippines — Ilocos Norte',
+	},
+	{
+		key: 'PH:ILS',
+		label: 'Philippines — Ilocos Sur',
+	},
+	{
+		key: 'PH:ILI',
+		label: 'Philippines — Iloilo',
+	},
+	{
+		key: 'PH:ISA',
+		label: 'Philippines — Isabela',
+	},
+	{
+		key: 'PH:KAL',
+		label: 'Philippines — Kalinga',
+	},
+	{
+		key: 'PH:LUN',
+		label: 'Philippines — La Union',
+	},
+	{
+		key: 'PH:LAG',
+		label: 'Philippines — Laguna',
+	},
+	{
+		key: 'PH:LAN',
+		label: 'Philippines — Lanao del Norte',
+	},
+	{
+		key: 'PH:LAS',
+		label: 'Philippines — Lanao del Sur',
+	},
+	{
+		key: 'PH:LEY',
+		label: 'Philippines — Leyte',
+	},
+	{
+		key: 'PH:MAG',
+		label: 'Philippines — Maguindanao',
+	},
+	{
+		key: 'PH:MAD',
+		label: 'Philippines — Marinduque',
+	},
+	{
+		key: 'PH:MAS',
+		label: 'Philippines — Masbate',
+	},
+	{
+		key: 'PH:MSC',
+		label: 'Philippines — Misamis Occidental',
+	},
+	{
+		key: 'PH:MSR',
+		label: 'Philippines — Misamis Oriental',
+	},
+	{
+		key: 'PH:MOU',
+		label: 'Philippines — Mountain Province',
+	},
+	{
+		key: 'PH:NEC',
+		label: 'Philippines — Negros Occidental',
+	},
+	{
+		key: 'PH:NER',
+		label: 'Philippines — Negros Oriental',
+	},
+	{
+		key: 'PH:NSA',
+		label: 'Philippines — Northern Samar',
+	},
+	{
+		key: 'PH:NUE',
+		label: 'Philippines — Nueva Ecija',
+	},
+	{
+		key: 'PH:NUV',
+		label: 'Philippines — Nueva Vizcaya',
+	},
+	{
+		key: 'PH:MDC',
+		label: 'Philippines — Occidental Mindoro',
+	},
+	{
+		key: 'PH:MDR',
+		label: 'Philippines — Oriental Mindoro',
+	},
+	{
+		key: 'PH:PLW',
+		label: 'Philippines — Palawan',
+	},
+	{
+		key: 'PH:PAM',
+		label: 'Philippines — Pampanga',
+	},
+	{
+		key: 'PH:PAN',
+		label: 'Philippines — Pangasinan',
+	},
+	{
+		key: 'PH:QUE',
+		label: 'Philippines — Quezon',
+	},
+	{
+		key: 'PH:QUI',
+		label: 'Philippines — Quirino',
+	},
+	{
+		key: 'PH:RIZ',
+		label: 'Philippines — Rizal',
+	},
+	{
+		key: 'PH:ROM',
+		label: 'Philippines — Romblon',
+	},
+	{
+		key: 'PH:WSA',
+		label: 'Philippines — Samar',
+	},
+	{
+		key: 'PH:SAR',
+		label: 'Philippines — Sarangani',
+	},
+	{
+		key: 'PH:SIQ',
+		label: 'Philippines — Siquijor',
+	},
+	{
+		key: 'PH:SOR',
+		label: 'Philippines — Sorsogon',
+	},
+	{
+		key: 'PH:SCO',
+		label: 'Philippines — South Cotabato',
+	},
+	{
+		key: 'PH:SLE',
+		label: 'Philippines — Southern Leyte',
+	},
+	{
+		key: 'PH:SUK',
+		label: 'Philippines — Sultan Kudarat',
+	},
+	{
+		key: 'PH:SLU',
+		label: 'Philippines — Sulu',
+	},
+	{
+		key: 'PH:SUN',
+		label: 'Philippines — Surigao del Norte',
+	},
+	{
+		key: 'PH:SUR',
+		label: 'Philippines — Surigao del Sur',
+	},
+	{
+		key: 'PH:TAR',
+		label: 'Philippines — Tarlac',
+	},
+	{
+		key: 'PH:TAW',
+		label: 'Philippines — Tawi-Tawi',
+	},
+	{
+		key: 'PH:ZMB',
+		label: 'Philippines — Zambales',
+	},
+	{
+		key: 'PH:ZAN',
+		label: 'Philippines — Zamboanga del Norte',
+	},
+	{
+		key: 'PH:ZAS',
+		label: 'Philippines — Zamboanga del Sur',
+	},
+	{
+		key: 'PH:ZSI',
+		label: 'Philippines — Zamboanga Sibugay',
+	},
+	{
+		key: 'PH:00',
+		label: 'Philippines — Metro Manila',
+	},
+	{
+		key: 'PN',
+		label: 'Pitcairn',
+	},
+	{
+		key: 'PL',
+		label: 'Poland',
+	},
+	{
+		key: 'PT',
+		label: 'Portugal',
+	},
+	{
+		key: 'PR',
+		label: 'Puerto Rico',
+	},
+	{
+		key: 'QA',
+		label: 'Qatar',
+	},
+	{
+		key: 'RE',
+		label: 'Reunion',
+	},
+	{
+		key: 'RO:AB',
+		label: 'Romania — Alba',
+	},
+	{
+		key: 'RO:AR',
+		label: 'Romania — Arad',
+	},
+	{
+		key: 'RO:AG',
+		label: 'Romania — Argeș',
+	},
+	{
+		key: 'RO:BC',
+		label: 'Romania — Bacău',
+	},
+	{
+		key: 'RO:BH',
+		label: 'Romania — Bihor',
+	},
+	{
+		key: 'RO:BN',
+		label: 'Romania — Bistrița-Năsăud',
+	},
+	{
+		key: 'RO:BT',
+		label: 'Romania — Botoșani',
+	},
+	{
+		key: 'RO:BR',
+		label: 'Romania — Brăila',
+	},
+	{
+		key: 'RO:BV',
+		label: 'Romania — Brașov',
+	},
+	{
+		key: 'RO:B',
+		label: 'Romania — București',
+	},
+	{
+		key: 'RO:BZ',
+		label: 'Romania — Buzău',
+	},
+	{
+		key: 'RO:CL',
+		label: 'Romania — Călărași',
+	},
+	{
+		key: 'RO:CS',
+		label: 'Romania — Caraș-Severin',
+	},
+	{
+		key: 'RO:CJ',
+		label: 'Romania — Cluj',
+	},
+	{
+		key: 'RO:CT',
+		label: 'Romania — Constanța',
+	},
+	{
+		key: 'RO:CV',
+		label: 'Romania — Covasna',
+	},
+	{
+		key: 'RO:DB',
+		label: 'Romania — Dâmbovița',
+	},
+	{
+		key: 'RO:DJ',
+		label: 'Romania — Dolj',
+	},
+	{
+		key: 'RO:GL',
+		label: 'Romania — Galați',
+	},
+	{
+		key: 'RO:GR',
+		label: 'Romania — Giurgiu',
+	},
+	{
+		key: 'RO:GJ',
+		label: 'Romania — Gorj',
+	},
+	{
+		key: 'RO:HR',
+		label: 'Romania — Harghita',
+	},
+	{
+		key: 'RO:HD',
+		label: 'Romania — Hunedoara',
+	},
+	{
+		key: 'RO:IL',
+		label: 'Romania — Ialomița',
+	},
+	{
+		key: 'RO:IS',
+		label: 'Romania — Iași',
+	},
+	{
+		key: 'RO:IF',
+		label: 'Romania — Ilfov',
+	},
+	{
+		key: 'RO:MM',
+		label: 'Romania — Maramureș',
+	},
+	{
+		key: 'RO:MH',
+		label: 'Romania — Mehedinți',
+	},
+	{
+		key: 'RO:MS',
+		label: 'Romania — Mureș',
+	},
+	{
+		key: 'RO:NT',
+		label: 'Romania — Neamț',
+	},
+	{
+		key: 'RO:OT',
+		label: 'Romania — Olt',
+	},
+	{
+		key: 'RO:PH',
+		label: 'Romania — Prahova',
+	},
+	{
+		key: 'RO:SJ',
+		label: 'Romania — Sălaj',
+	},
+	{
+		key: 'RO:SM',
+		label: 'Romania — Satu Mare',
+	},
+	{
+		key: 'RO:SB',
+		label: 'Romania — Sibiu',
+	},
+	{
+		key: 'RO:SV',
+		label: 'Romania — Suceava',
+	},
+	{
+		key: 'RO:TR',
+		label: 'Romania — Teleorman',
+	},
+	{
+		key: 'RO:TM',
+		label: 'Romania — Timiș',
+	},
+	{
+		key: 'RO:TL',
+		label: 'Romania — Tulcea',
+	},
+	{
+		key: 'RO:VL',
+		label: 'Romania — Vâlcea',
+	},
+	{
+		key: 'RO:VS',
+		label: 'Romania — Vaslui',
+	},
+	{
+		key: 'RO:VN',
+		label: 'Romania — Vrancea',
+	},
+	{
+		key: 'RU',
+		label: 'Russia',
+	},
+	{
+		key: 'RW',
+		label: 'Rwanda',
+	},
+	{
+		key: 'ST',
+		label: 'São Tomé and Príncipe',
+	},
+	{
+		key: 'BL',
+		label: 'Saint Barthélemy',
+	},
+	{
+		key: 'SH',
+		label: 'Saint Helena',
+	},
+	{
+		key: 'KN',
+		label: 'Saint Kitts and Nevis',
+	},
+	{
+		key: 'LC',
+		label: 'Saint Lucia',
+	},
+	{
+		key: 'SX',
+		label: 'Saint Martin (Dutch part)',
+	},
+	{
+		key: 'MF',
+		label: 'Saint Martin (French part)',
+	},
+	{
+		key: 'PM',
+		label: 'Saint Pierre and Miquelon',
+	},
+	{
+		key: 'VC',
+		label: 'Saint Vincent and the Grenadines',
+	},
+	{
+		key: 'WS',
+		label: 'Samoa',
+	},
+	{
+		key: 'SM',
+		label: 'San Marino',
+	},
+	{
+		key: 'SA',
+		label: 'Saudi Arabia',
+	},
+	{
+		key: 'SN:SNDB',
+		label: 'Senegal — Diourbel',
+	},
+	{
+		key: 'SN:SNDK',
+		label: 'Senegal — Dakar',
+	},
+	{
+		key: 'SN:SNFK',
+		label: 'Senegal — Fatick',
+	},
+	{
+		key: 'SN:SNKA',
+		label: 'Senegal — Kaffrine',
+	},
+	{
+		key: 'SN:SNKD',
+		label: 'Senegal — Kolda',
+	},
+	{
+		key: 'SN:SNKE',
+		label: 'Senegal — Kédougou',
+	},
+	{
+		key: 'SN:SNKL',
+		label: 'Senegal — Kaolack',
+	},
+	{
+		key: 'SN:SNLG',
+		label: 'Senegal — Louga',
+	},
+	{
+		key: 'SN:SNMT',
+		label: 'Senegal — Matam',
+	},
+	{
+		key: 'SN:SNSE',
+		label: 'Senegal — Sédhiou',
+	},
+	{
+		key: 'SN:SNSL',
+		label: 'Senegal — Saint-Louis',
+	},
+	{
+		key: 'SN:SNTC',
+		label: 'Senegal — Tambacounda',
+	},
+	{
+		key: 'SN:SNTH',
+		label: 'Senegal — Thiès',
+	},
+	{
+		key: 'SN:SNZG',
+		label: 'Senegal — Ziguinchor',
+	},
+	{
+		key: 'RS:RS00',
+		label: 'Serbia — Belgrade',
+	},
+	{
+		key: 'RS:RS14',
+		label: 'Serbia — Bor',
+	},
+	{
+		key: 'RS:RS11',
+		label: 'Serbia — Braničevo',
+	},
+	{
+		key: 'RS:RS02',
+		label: 'Serbia — Central Banat',
+	},
+	{
+		key: 'RS:RS10',
+		label: 'Serbia — Danube',
+	},
+	{
+		key: 'RS:RS23',
+		label: 'Serbia — Jablanica',
+	},
+	{
+		key: 'RS:RS09',
+		label: 'Serbia — Kolubara',
+	},
+	{
+		key: 'RS:RS08',
+		label: 'Serbia — Mačva',
+	},
+	{
+		key: 'RS:RS17',
+		label: 'Serbia — Morava',
+	},
+	{
+		key: 'RS:RS20',
+		label: 'Serbia — Nišava',
+	},
+	{
+		key: 'RS:RS01',
+		label: 'Serbia — North Bačka',
+	},
+	{
+		key: 'RS:RS03',
+		label: 'Serbia — North Banat',
+	},
+	{
+		key: 'RS:RS24',
+		label: 'Serbia — Pčinja',
+	},
+	{
+		key: 'RS:RS22',
+		label: 'Serbia — Pirot',
+	},
+	{
+		key: 'RS:RS13',
+		label: 'Serbia — Pomoravlje',
+	},
+	{
+		key: 'RS:RS19',
+		label: 'Serbia — Rasina',
+	},
+	{
+		key: 'RS:RS18',
+		label: 'Serbia — Raška',
+	},
+	{
+		key: 'RS:RS06',
+		label: 'Serbia — South Bačka',
+	},
+	{
+		key: 'RS:RS04',
+		label: 'Serbia — South Banat',
+	},
+	{
+		key: 'RS:RS07',
+		label: 'Serbia — Srem',
+	},
+	{
+		key: 'RS:RS12',
+		label: 'Serbia — Šumadija',
+	},
+	{
+		key: 'RS:RS21',
+		label: 'Serbia — Toplica',
+	},
+	{
+		key: 'RS:RS05',
+		label: 'Serbia — West Bačka',
+	},
+	{
+		key: 'RS:RS15',
+		label: 'Serbia — Zaječar',
+	},
+	{
+		key: 'RS:RS16',
+		label: 'Serbia — Zlatibor',
+	},
+	{
+		key: 'RS:RS25',
+		label: 'Serbia — Kosovo',
+	},
+	{
+		key: 'RS:RS26',
+		label: 'Serbia — Peć',
+	},
+	{
+		key: 'RS:RS27',
+		label: 'Serbia — Prizren',
+	},
+	{
+		key: 'RS:RS28',
+		label: 'Serbia — Kosovska Mitrovica',
+	},
+	{
+		key: 'RS:RS29',
+		label: 'Serbia — Kosovo-Pomoravlje',
+	},
+	{
+		key: 'RS:RSKM',
+		label: 'Serbia — Kosovo-Metohija',
+	},
+	{
+		key: 'RS:RSVO',
+		label: 'Serbia — Vojvodina',
+	},
+	{
+		key: 'SC',
+		label: 'Seychelles',
+	},
+	{
+		key: 'SL',
+		label: 'Sierra Leone',
+	},
+	{
+		key: 'SG',
+		label: 'Singapore',
+	},
+	{
+		key: 'SK',
+		label: 'Slovakia',
+	},
+	{
+		key: 'SI',
+		label: 'Slovenia',
+	},
+	{
+		key: 'SB',
+		label: 'Solomon Islands',
+	},
+	{
+		key: 'SO',
+		label: 'Somalia',
+	},
+	{
+		key: 'ZA:EC',
+		label: 'South Africa — Eastern Cape',
+	},
+	{
+		key: 'ZA:FS',
+		label: 'South Africa — Free State',
+	},
+	{
+		key: 'ZA:GP',
+		label: 'South Africa — Gauteng',
+	},
+	{
+		key: 'ZA:KZN',
+		label: 'South Africa — KwaZulu-Natal',
+	},
+	{
+		key: 'ZA:LP',
+		label: 'South Africa — Limpopo',
+	},
+	{
+		key: 'ZA:MP',
+		label: 'South Africa — Mpumalanga',
+	},
+	{
+		key: 'ZA:NC',
+		label: 'South Africa — Northern Cape',
+	},
+	{
+		key: 'ZA:NW',
+		label: 'South Africa — North West',
+	},
+	{
+		key: 'ZA:WC',
+		label: 'South Africa — Western Cape',
+	},
+	{
+		key: 'GS',
+		label: 'South Georgia/Sandwich Islands',
+	},
+	{
+		key: 'KR',
+		label: 'South Korea',
+	},
+	{
+		key: 'SS',
+		label: 'South Sudan',
+	},
+	{
+		key: 'ES:C',
+		label: 'Spain — A Coruña',
+	},
+	{
+		key: 'ES:VI',
+		label: 'Spain — Araba/Álava',
+	},
+	{
+		key: 'ES:AB',
+		label: 'Spain — Albacete',
+	},
+	{
+		key: 'ES:A',
+		label: 'Spain — Alicante',
+	},
+	{
+		key: 'ES:AL',
+		label: 'Spain — Almería',
+	},
+	{
+		key: 'ES:O',
+		label: 'Spain — Asturias',
+	},
+	{
+		key: 'ES:AV',
+		label: 'Spain — Ávila',
+	},
+	{
+		key: 'ES:BA',
+		label: 'Spain — Badajoz',
+	},
+	{
+		key: 'ES:PM',
+		label: 'Spain — Baleares',
+	},
+	{
+		key: 'ES:B',
+		label: 'Spain — Barcelona',
+	},
+	{
+		key: 'ES:BU',
+		label: 'Spain — Burgos',
+	},
+	{
+		key: 'ES:CC',
+		label: 'Spain — Cáceres',
+	},
+	{
+		key: 'ES:CA',
+		label: 'Spain — Cádiz',
+	},
+	{
+		key: 'ES:S',
+		label: 'Spain — Cantabria',
+	},
+	{
+		key: 'ES:CS',
+		label: 'Spain — Castellón',
+	},
+	{
+		key: 'ES:CE',
+		label: 'Spain — Ceuta',
+	},
+	{
+		key: 'ES:CR',
+		label: 'Spain — Ciudad Real',
+	},
+	{
+		key: 'ES:CO',
+		label: 'Spain — Córdoba',
+	},
+	{
+		key: 'ES:CU',
+		label: 'Spain — Cuenca',
+	},
+	{
+		key: 'ES:GI',
+		label: 'Spain — Girona',
+	},
+	{
+		key: 'ES:GR',
+		label: 'Spain — Granada',
+	},
+	{
+		key: 'ES:GU',
+		label: 'Spain — Guadalajara',
+	},
+	{
+		key: 'ES:SS',
+		label: 'Spain — Gipuzkoa',
+	},
+	{
+		key: 'ES:H',
+		label: 'Spain — Huelva',
+	},
+	{
+		key: 'ES:HU',
+		label: 'Spain — Huesca',
+	},
+	{
+		key: 'ES:J',
+		label: 'Spain — Jaén',
+	},
+	{
+		key: 'ES:LO',
+		label: 'Spain — La Rioja',
+	},
+	{
+		key: 'ES:GC',
+		label: 'Spain — Las Palmas',
+	},
+	{
+		key: 'ES:LE',
+		label: 'Spain — León',
+	},
+	{
+		key: 'ES:L',
+		label: 'Spain — Lleida',
+	},
+	{
+		key: 'ES:LU',
+		label: 'Spain — Lugo',
+	},
+	{
+		key: 'ES:M',
+		label: 'Spain — Madrid',
+	},
+	{
+		key: 'ES:MA',
+		label: 'Spain — Málaga',
+	},
+	{
+		key: 'ES:ML',
+		label: 'Spain — Melilla',
+	},
+	{
+		key: 'ES:MU',
+		label: 'Spain — Murcia',
+	},
+	{
+		key: 'ES:NA',
+		label: 'Spain — Navarra',
+	},
+	{
+		key: 'ES:OR',
+		label: 'Spain — Ourense',
+	},
+	{
+		key: 'ES:P',
+		label: 'Spain — Palencia',
+	},
+	{
+		key: 'ES:PO',
+		label: 'Spain — Pontevedra',
+	},
+	{
+		key: 'ES:SA',
+		label: 'Spain — Salamanca',
+	},
+	{
+		key: 'ES:TF',
+		label: 'Spain — Santa Cruz de Tenerife',
+	},
+	{
+		key: 'ES:SG',
+		label: 'Spain — Segovia',
+	},
+	{
+		key: 'ES:SE',
+		label: 'Spain — Sevilla',
+	},
+	{
+		key: 'ES:SO',
+		label: 'Spain — Soria',
+	},
+	{
+		key: 'ES:T',
+		label: 'Spain — Tarragona',
+	},
+	{
+		key: 'ES:TE',
+		label: 'Spain — Teruel',
+	},
+	{
+		key: 'ES:TO',
+		label: 'Spain — Toledo',
+	},
+	{
+		key: 'ES:V',
+		label: 'Spain — Valencia',
+	},
+	{
+		key: 'ES:VA',
+		label: 'Spain — Valladolid',
+	},
+	{
+		key: 'ES:BI',
+		label: 'Spain — Biscay',
+	},
+	{
+		key: 'ES:ZA',
+		label: 'Spain — Zamora',
+	},
+	{
+		key: 'ES:Z',
+		label: 'Spain — Zaragoza',
+	},
+	{
+		key: 'LK',
+		label: 'Sri Lanka',
+	},
+	{
+		key: 'SD',
+		label: 'Sudan',
+	},
+	{
+		key: 'SR',
+		label: 'Suriname',
+	},
+	{
+		key: 'SJ',
+		label: 'Svalbard and Jan Mayen',
+	},
+	{
+		key: 'SE',
+		label: 'Sweden',
+	},
+	{
+		key: 'CH:AG',
+		label: 'Switzerland — Aargau',
+	},
+	{
+		key: 'CH:AR',
+		label: 'Switzerland — Appenzell Ausserrhoden',
+	},
+	{
+		key: 'CH:AI',
+		label: 'Switzerland — Appenzell Innerrhoden',
+	},
+	{
+		key: 'CH:BL',
+		label: 'Switzerland — Basel-Landschaft',
+	},
+	{
+		key: 'CH:BS',
+		label: 'Switzerland — Basel-Stadt',
+	},
+	{
+		key: 'CH:BE',
+		label: 'Switzerland — Bern',
+	},
+	{
+		key: 'CH:FR',
+		label: 'Switzerland — Fribourg',
+	},
+	{
+		key: 'CH:GE',
+		label: 'Switzerland — Geneva',
+	},
+	{
+		key: 'CH:GL',
+		label: 'Switzerland — Glarus',
+	},
+	{
+		key: 'CH:GR',
+		label: 'Switzerland — Graubünden',
+	},
+	{
+		key: 'CH:JU',
+		label: 'Switzerland — Jura',
+	},
+	{
+		key: 'CH:LU',
+		label: 'Switzerland — Luzern',
+	},
+	{
+		key: 'CH:NE',
+		label: 'Switzerland — Neuchâtel',
+	},
+	{
+		key: 'CH:NW',
+		label: 'Switzerland — Nidwalden',
+	},
+	{
+		key: 'CH:OW',
+		label: 'Switzerland — Obwalden',
+	},
+	{
+		key: 'CH:SH',
+		label: 'Switzerland — Schaffhausen',
+	},
+	{
+		key: 'CH:SZ',
+		label: 'Switzerland — Schwyz',
+	},
+	{
+		key: 'CH:SO',
+		label: 'Switzerland — Solothurn',
+	},
+	{
+		key: 'CH:SG',
+		label: 'Switzerland — St. Gallen',
+	},
+	{
+		key: 'CH:TG',
+		label: 'Switzerland — Thurgau',
+	},
+	{
+		key: 'CH:TI',
+		label: 'Switzerland — Ticino',
+	},
+	{
+		key: 'CH:UR',
+		label: 'Switzerland — Uri',
+	},
+	{
+		key: 'CH:VS',
+		label: 'Switzerland — Valais',
+	},
+	{
+		key: 'CH:VD',
+		label: 'Switzerland — Vaud',
+	},
+	{
+		key: 'CH:ZG',
+		label: 'Switzerland — Zug',
+	},
+	{
+		key: 'CH:ZH',
+		label: 'Switzerland — Zürich',
+	},
+	{
+		key: 'SY',
+		label: 'Syria',
+	},
+	{
+		key: 'TW',
+		label: 'Taiwan',
+	},
+	{
+		key: 'TJ',
+		label: 'Tajikistan',
+	},
+	{
+		key: 'TZ:TZ01',
+		label: 'Tanzania — Arusha',
+	},
+	{
+		key: 'TZ:TZ02',
+		label: 'Tanzania — Dar es Salaam',
+	},
+	{
+		key: 'TZ:TZ03',
+		label: 'Tanzania — Dodoma',
+	},
+	{
+		key: 'TZ:TZ04',
+		label: 'Tanzania — Iringa',
+	},
+	{
+		key: 'TZ:TZ05',
+		label: 'Tanzania — Kagera',
+	},
+	{
+		key: 'TZ:TZ06',
+		label: 'Tanzania — Pemba North',
+	},
+	{
+		key: 'TZ:TZ07',
+		label: 'Tanzania — Zanzibar North',
+	},
+	{
+		key: 'TZ:TZ08',
+		label: 'Tanzania — Kigoma',
+	},
+	{
+		key: 'TZ:TZ09',
+		label: 'Tanzania — Kilimanjaro',
+	},
+	{
+		key: 'TZ:TZ10',
+		label: 'Tanzania — Pemba South',
+	},
+	{
+		key: 'TZ:TZ11',
+		label: 'Tanzania — Zanzibar South',
+	},
+	{
+		key: 'TZ:TZ12',
+		label: 'Tanzania — Lindi',
+	},
+	{
+		key: 'TZ:TZ13',
+		label: 'Tanzania — Mara',
+	},
+	{
+		key: 'TZ:TZ14',
+		label: 'Tanzania — Mbeya',
+	},
+	{
+		key: 'TZ:TZ15',
+		label: 'Tanzania — Zanzibar West',
+	},
+	{
+		key: 'TZ:TZ16',
+		label: 'Tanzania — Morogoro',
+	},
+	{
+		key: 'TZ:TZ17',
+		label: 'Tanzania — Mtwara',
+	},
+	{
+		key: 'TZ:TZ18',
+		label: 'Tanzania — Mwanza',
+	},
+	{
+		key: 'TZ:TZ19',
+		label: 'Tanzania — Coast',
+	},
+	{
+		key: 'TZ:TZ20',
+		label: 'Tanzania — Rukwa',
+	},
+	{
+		key: 'TZ:TZ21',
+		label: 'Tanzania — Ruvuma',
+	},
+	{
+		key: 'TZ:TZ22',
+		label: 'Tanzania — Shinyanga',
+	},
+	{
+		key: 'TZ:TZ23',
+		label: 'Tanzania — Singida',
+	},
+	{
+		key: 'TZ:TZ24',
+		label: 'Tanzania — Tabora',
+	},
+	{
+		key: 'TZ:TZ25',
+		label: 'Tanzania — Tanga',
+	},
+	{
+		key: 'TZ:TZ26',
+		label: 'Tanzania — Manyara',
+	},
+	{
+		key: 'TZ:TZ27',
+		label: 'Tanzania — Geita',
+	},
+	{
+		key: 'TZ:TZ28',
+		label: 'Tanzania — Katavi',
+	},
+	{
+		key: 'TZ:TZ29',
+		label: 'Tanzania — Njombe',
+	},
+	{
+		key: 'TZ:TZ30',
+		label: 'Tanzania — Simiyu',
+	},
+	{
+		key: 'TH:TH-37',
+		label: 'Thailand — Amnat Charoen',
+	},
+	{
+		key: 'TH:TH-15',
+		label: 'Thailand — Ang Thong',
+	},
+	{
+		key: 'TH:TH-14',
+		label: 'Thailand — Ayutthaya',
+	},
+	{
+		key: 'TH:TH-10',
+		label: 'Thailand — Bangkok',
+	},
+	{
+		key: 'TH:TH-38',
+		label: 'Thailand — Bueng Kan',
+	},
+	{
+		key: 'TH:TH-31',
+		label: 'Thailand — Buri Ram',
+	},
+	{
+		key: 'TH:TH-24',
+		label: 'Thailand — Chachoengsao',
+	},
+	{
+		key: 'TH:TH-18',
+		label: 'Thailand — Chai Nat',
+	},
+	{
+		key: 'TH:TH-36',
+		label: 'Thailand — Chaiyaphum',
+	},
+	{
+		key: 'TH:TH-22',
+		label: 'Thailand — Chanthaburi',
+	},
+	{
+		key: 'TH:TH-50',
+		label: 'Thailand — Chiang Mai',
+	},
+	{
+		key: 'TH:TH-57',
+		label: 'Thailand — Chiang Rai',
+	},
+	{
+		key: 'TH:TH-20',
+		label: 'Thailand — Chonburi',
+	},
+	{
+		key: 'TH:TH-86',
+		label: 'Thailand — Chumphon',
+	},
+	{
+		key: 'TH:TH-46',
+		label: 'Thailand — Kalasin',
+	},
+	{
+		key: 'TH:TH-62',
+		label: 'Thailand — Kamphaeng Phet',
+	},
+	{
+		key: 'TH:TH-71',
+		label: 'Thailand — Kanchanaburi',
+	},
+	{
+		key: 'TH:TH-40',
+		label: 'Thailand — Khon Kaen',
+	},
+	{
+		key: 'TH:TH-81',
+		label: 'Thailand — Krabi',
+	},
+	{
+		key: 'TH:TH-52',
+		label: 'Thailand — Lampang',
+	},
+	{
+		key: 'TH:TH-51',
+		label: 'Thailand — Lamphun',
+	},
+	{
+		key: 'TH:TH-42',
+		label: 'Thailand — Loei',
+	},
+	{
+		key: 'TH:TH-16',
+		label: 'Thailand — Lopburi',
+	},
+	{
+		key: 'TH:TH-58',
+		label: 'Thailand — Mae Hong Son',
+	},
+	{
+		key: 'TH:TH-44',
+		label: 'Thailand — Maha Sarakham',
+	},
+	{
+		key: 'TH:TH-49',
+		label: 'Thailand — Mukdahan',
+	},
+	{
+		key: 'TH:TH-26',
+		label: 'Thailand — Nakhon Nayok',
+	},
+	{
+		key: 'TH:TH-73',
+		label: 'Thailand — Nakhon Pathom',
+	},
+	{
+		key: 'TH:TH-48',
+		label: 'Thailand — Nakhon Phanom',
+	},
+	{
+		key: 'TH:TH-30',
+		label: 'Thailand — Nakhon Ratchasima',
+	},
+	{
+		key: 'TH:TH-60',
+		label: 'Thailand — Nakhon Sawan',
+	},
+	{
+		key: 'TH:TH-80',
+		label: 'Thailand — Nakhon Si Thammarat',
+	},
+	{
+		key: 'TH:TH-55',
+		label: 'Thailand — Nan',
+	},
+	{
+		key: 'TH:TH-96',
+		label: 'Thailand — Narathiwat',
+	},
+	{
+		key: 'TH:TH-39',
+		label: 'Thailand — Nong Bua Lam Phu',
+	},
+	{
+		key: 'TH:TH-43',
+		label: 'Thailand — Nong Khai',
+	},
+	{
+		key: 'TH:TH-12',
+		label: 'Thailand — Nonthaburi',
+	},
+	{
+		key: 'TH:TH-13',
+		label: 'Thailand — Pathum Thani',
+	},
+	{
+		key: 'TH:TH-94',
+		label: 'Thailand — Pattani',
+	},
+	{
+		key: 'TH:TH-82',
+		label: 'Thailand — Phang Nga',
+	},
+	{
+		key: 'TH:TH-93',
+		label: 'Thailand — Phatthalung',
+	},
+	{
+		key: 'TH:TH-56',
+		label: 'Thailand — Phayao',
+	},
+	{
+		key: 'TH:TH-67',
+		label: 'Thailand — Phetchabun',
+	},
+	{
+		key: 'TH:TH-76',
+		label: 'Thailand — Phetchaburi',
+	},
+	{
+		key: 'TH:TH-66',
+		label: 'Thailand — Phichit',
+	},
+	{
+		key: 'TH:TH-65',
+		label: 'Thailand — Phitsanulok',
+	},
+	{
+		key: 'TH:TH-54',
+		label: 'Thailand — Phrae',
+	},
+	{
+		key: 'TH:TH-83',
+		label: 'Thailand — Phuket',
+	},
+	{
+		key: 'TH:TH-25',
+		label: 'Thailand — Prachin Buri',
+	},
+	{
+		key: 'TH:TH-77',
+		label: 'Thailand — Prachuap Khiri Khan',
+	},
+	{
+		key: 'TH:TH-85',
+		label: 'Thailand — Ranong',
+	},
+	{
+		key: 'TH:TH-70',
+		label: 'Thailand — Ratchaburi',
+	},
+	{
+		key: 'TH:TH-21',
+		label: 'Thailand — Rayong',
+	},
+	{
+		key: 'TH:TH-45',
+		label: 'Thailand — Roi Et',
+	},
+	{
+		key: 'TH:TH-27',
+		label: 'Thailand — Sa Kaeo',
+	},
+	{
+		key: 'TH:TH-47',
+		label: 'Thailand — Sakon Nakhon',
+	},
+	{
+		key: 'TH:TH-11',
+		label: 'Thailand — Samut Prakan',
+	},
+	{
+		key: 'TH:TH-74',
+		label: 'Thailand — Samut Sakhon',
+	},
+	{
+		key: 'TH:TH-75',
+		label: 'Thailand — Samut Songkhram',
+	},
+	{
+		key: 'TH:TH-19',
+		label: 'Thailand — Saraburi',
+	},
+	{
+		key: 'TH:TH-91',
+		label: 'Thailand — Satun',
+	},
+	{
+		key: 'TH:TH-17',
+		label: 'Thailand — Sing Buri',
+	},
+	{
+		key: 'TH:TH-33',
+		label: 'Thailand — Sisaket',
+	},
+	{
+		key: 'TH:TH-90',
+		label: 'Thailand — Songkhla',
+	},
+	{
+		key: 'TH:TH-64',
+		label: 'Thailand — Sukhothai',
+	},
+	{
+		key: 'TH:TH-72',
+		label: 'Thailand — Suphan Buri',
+	},
+	{
+		key: 'TH:TH-84',
+		label: 'Thailand — Surat Thani',
+	},
+	{
+		key: 'TH:TH-32',
+		label: 'Thailand — Surin',
+	},
+	{
+		key: 'TH:TH-63',
+		label: 'Thailand — Tak',
+	},
+	{
+		key: 'TH:TH-92',
+		label: 'Thailand — Trang',
+	},
+	{
+		key: 'TH:TH-23',
+		label: 'Thailand — Trat',
+	},
+	{
+		key: 'TH:TH-34',
+		label: 'Thailand — Ubon Ratchathani',
+	},
+	{
+		key: 'TH:TH-41',
+		label: 'Thailand — Udon Thani',
+	},
+	{
+		key: 'TH:TH-61',
+		label: 'Thailand — Uthai Thani',
+	},
+	{
+		key: 'TH:TH-53',
+		label: 'Thailand — Uttaradit',
+	},
+	{
+		key: 'TH:TH-95',
+		label: 'Thailand — Yala',
+	},
+	{
+		key: 'TH:TH-35',
+		label: 'Thailand — Yasothon',
+	},
+	{
+		key: 'TL',
+		label: 'Timor-Leste',
+	},
+	{
+		key: 'TG',
+		label: 'Togo',
+	},
+	{
+		key: 'TK',
+		label: 'Tokelau',
+	},
+	{
+		key: 'TO',
+		label: 'Tonga',
+	},
+	{
+		key: 'TT',
+		label: 'Trinidad and Tobago',
+	},
+	{
+		key: 'TN',
+		label: 'Tunisia',
+	},
+	{
+		key: 'TR:TR01',
+		label: 'Turkey — Adana',
+	},
+	{
+		key: 'TR:TR02',
+		label: 'Turkey — Adıyaman',
+	},
+	{
+		key: 'TR:TR03',
+		label: 'Turkey — Afyon',
+	},
+	{
+		key: 'TR:TR04',
+		label: 'Turkey — Ağrı',
+	},
+	{
+		key: 'TR:TR05',
+		label: 'Turkey — Amasya',
+	},
+	{
+		key: 'TR:TR06',
+		label: 'Turkey — Ankara',
+	},
+	{
+		key: 'TR:TR07',
+		label: 'Turkey — Antalya',
+	},
+	{
+		key: 'TR:TR08',
+		label: 'Turkey — Artvin',
+	},
+	{
+		key: 'TR:TR09',
+		label: 'Turkey — Aydın',
+	},
+	{
+		key: 'TR:TR10',
+		label: 'Turkey — Balıkesir',
+	},
+	{
+		key: 'TR:TR11',
+		label: 'Turkey — Bilecik',
+	},
+	{
+		key: 'TR:TR12',
+		label: 'Turkey — Bingöl',
+	},
+	{
+		key: 'TR:TR13',
+		label: 'Turkey — Bitlis',
+	},
+	{
+		key: 'TR:TR14',
+		label: 'Turkey — Bolu',
+	},
+	{
+		key: 'TR:TR15',
+		label: 'Turkey — Burdur',
+	},
+	{
+		key: 'TR:TR16',
+		label: 'Turkey — Bursa',
+	},
+	{
+		key: 'TR:TR17',
+		label: 'Turkey — Çanakkale',
+	},
+	{
+		key: 'TR:TR18',
+		label: 'Turkey — Çankırı',
+	},
+	{
+		key: 'TR:TR19',
+		label: 'Turkey — Çorum',
+	},
+	{
+		key: 'TR:TR20',
+		label: 'Turkey — Denizli',
+	},
+	{
+		key: 'TR:TR21',
+		label: 'Turkey — Diyarbakır',
+	},
+	{
+		key: 'TR:TR22',
+		label: 'Turkey — Edirne',
+	},
+	{
+		key: 'TR:TR23',
+		label: 'Turkey — Elazığ',
+	},
+	{
+		key: 'TR:TR24',
+		label: 'Turkey — Erzincan',
+	},
+	{
+		key: 'TR:TR25',
+		label: 'Turkey — Erzurum',
+	},
+	{
+		key: 'TR:TR26',
+		label: 'Turkey — Eskişehir',
+	},
+	{
+		key: 'TR:TR27',
+		label: 'Turkey — Gaziantep',
+	},
+	{
+		key: 'TR:TR28',
+		label: 'Turkey — Giresun',
+	},
+	{
+		key: 'TR:TR29',
+		label: 'Turkey — Gümüşhane',
+	},
+	{
+		key: 'TR:TR30',
+		label: 'Turkey — Hakkari',
+	},
+	{
+		key: 'TR:TR31',
+		label: 'Turkey — Hatay',
+	},
+	{
+		key: 'TR:TR32',
+		label: 'Turkey — Isparta',
+	},
+	{
+		key: 'TR:TR33',
+		label: 'Turkey — İçel',
+	},
+	{
+		key: 'TR:TR34',
+		label: 'Turkey — İstanbul',
+	},
+	{
+		key: 'TR:TR35',
+		label: 'Turkey — İzmir',
+	},
+	{
+		key: 'TR:TR36',
+		label: 'Turkey — Kars',
+	},
+	{
+		key: 'TR:TR37',
+		label: 'Turkey — Kastamonu',
+	},
+	{
+		key: 'TR:TR38',
+		label: 'Turkey — Kayseri',
+	},
+	{
+		key: 'TR:TR39',
+		label: 'Turkey — Kırklareli',
+	},
+	{
+		key: 'TR:TR40',
+		label: 'Turkey — Kırşehir',
+	},
+	{
+		key: 'TR:TR41',
+		label: 'Turkey — Kocaeli',
+	},
+	{
+		key: 'TR:TR42',
+		label: 'Turkey — Konya',
+	},
+	{
+		key: 'TR:TR43',
+		label: 'Turkey — Kütahya',
+	},
+	{
+		key: 'TR:TR44',
+		label: 'Turkey — Malatya',
+	},
+	{
+		key: 'TR:TR45',
+		label: 'Turkey — Manisa',
+	},
+	{
+		key: 'TR:TR46',
+		label: 'Turkey — Kahramanmaraş',
+	},
+	{
+		key: 'TR:TR47',
+		label: 'Turkey — Mardin',
+	},
+	{
+		key: 'TR:TR48',
+		label: 'Turkey — Muğla',
+	},
+	{
+		key: 'TR:TR49',
+		label: 'Turkey — Muş',
+	},
+	{
+		key: 'TR:TR50',
+		label: 'Turkey — Nevşehir',
+	},
+	{
+		key: 'TR:TR51',
+		label: 'Turkey — Niğde',
+	},
+	{
+		key: 'TR:TR52',
+		label: 'Turkey — Ordu',
+	},
+	{
+		key: 'TR:TR53',
+		label: 'Turkey — Rize',
+	},
+	{
+		key: 'TR:TR54',
+		label: 'Turkey — Sakarya',
+	},
+	{
+		key: 'TR:TR55',
+		label: 'Turkey — Samsun',
+	},
+	{
+		key: 'TR:TR56',
+		label: 'Turkey — Siirt',
+	},
+	{
+		key: 'TR:TR57',
+		label: 'Turkey — Sinop',
+	},
+	{
+		key: 'TR:TR58',
+		label: 'Turkey — Sivas',
+	},
+	{
+		key: 'TR:TR59',
+		label: 'Turkey — Tekirdağ',
+	},
+	{
+		key: 'TR:TR60',
+		label: 'Turkey — Tokat',
+	},
+	{
+		key: 'TR:TR61',
+		label: 'Turkey — Trabzon',
+	},
+	{
+		key: 'TR:TR62',
+		label: 'Turkey — Tunceli',
+	},
+	{
+		key: 'TR:TR63',
+		label: 'Turkey — Şanlıurfa',
+	},
+	{
+		key: 'TR:TR64',
+		label: 'Turkey — Uşak',
+	},
+	{
+		key: 'TR:TR65',
+		label: 'Turkey — Van',
+	},
+	{
+		key: 'TR:TR66',
+		label: 'Turkey — Yozgat',
+	},
+	{
+		key: 'TR:TR67',
+		label: 'Turkey — Zonguldak',
+	},
+	{
+		key: 'TR:TR68',
+		label: 'Turkey — Aksaray',
+	},
+	{
+		key: 'TR:TR69',
+		label: 'Turkey — Bayburt',
+	},
+	{
+		key: 'TR:TR70',
+		label: 'Turkey — Karaman',
+	},
+	{
+		key: 'TR:TR71',
+		label: 'Turkey — Kırıkkale',
+	},
+	{
+		key: 'TR:TR72',
+		label: 'Turkey — Batman',
+	},
+	{
+		key: 'TR:TR73',
+		label: 'Turkey — Şırnak',
+	},
+	{
+		key: 'TR:TR74',
+		label: 'Turkey — Bartın',
+	},
+	{
+		key: 'TR:TR75',
+		label: 'Turkey — Ardahan',
+	},
+	{
+		key: 'TR:TR76',
+		label: 'Turkey — Iğdır',
+	},
+	{
+		key: 'TR:TR77',
+		label: 'Turkey — Yalova',
+	},
+	{
+		key: 'TR:TR78',
+		label: 'Turkey — Karabük',
+	},
+	{
+		key: 'TR:TR79',
+		label: 'Turkey — Kilis',
+	},
+	{
+		key: 'TR:TR80',
+		label: 'Turkey — Osmaniye',
+	},
+	{
+		key: 'TR:TR81',
+		label: 'Turkey — Düzce',
+	},
+	{
+		key: 'TM',
+		label: 'Turkmenistan',
+	},
+	{
+		key: 'TC',
+		label: 'Turks and Caicos Islands',
+	},
+	{
+		key: 'TV',
+		label: 'Tuvalu',
+	},
+	{
+		key: 'UG:UG314',
+		label: 'Uganda — Abim',
+	},
+	{
+		key: 'UG:UG301',
+		label: 'Uganda — Adjumani',
+	},
+	{
+		key: 'UG:UG322',
+		label: 'Uganda — Agago',
+	},
+	{
+		key: 'UG:UG323',
+		label: 'Uganda — Alebtong',
+	},
+	{
+		key: 'UG:UG315',
+		label: 'Uganda — Amolatar',
+	},
+	{
+		key: 'UG:UG324',
+		label: 'Uganda — Amudat',
+	},
+	{
+		key: 'UG:UG216',
+		label: 'Uganda — Amuria',
+	},
+	{
+		key: 'UG:UG316',
+		label: 'Uganda — Amuru',
+	},
+	{
+		key: 'UG:UG302',
+		label: 'Uganda — Apac',
+	},
+	{
+		key: 'UG:UG303',
+		label: 'Uganda — Arua',
+	},
+	{
+		key: 'UG:UG217',
+		label: 'Uganda — Budaka',
+	},
+	{
+		key: 'UG:UG218',
+		label: 'Uganda — Bududa',
+	},
+	{
+		key: 'UG:UG201',
+		label: 'Uganda — Bugiri',
+	},
+	{
+		key: 'UG:UG235',
+		label: 'Uganda — Bugweri',
+	},
+	{
+		key: 'UG:UG420',
+		label: 'Uganda — Buhweju',
+	},
+	{
+		key: 'UG:UG117',
+		label: 'Uganda — Buikwe',
+	},
+	{
+		key: 'UG:UG219',
+		label: 'Uganda — Bukedea',
+	},
+	{
+		key: 'UG:UG118',
+		label: 'Uganda — Bukomansimbi',
+	},
+	{
+		key: 'UG:UG220',
+		label: 'Uganda — Bukwa',
+	},
+	{
+		key: 'UG:UG225',
+		label: 'Uganda — Bulambuli',
+	},
+	{
+		key: 'UG:UG416',
+		label: 'Uganda — Buliisa',
+	},
+	{
+		key: 'UG:UG401',
+		label: 'Uganda — Bundibugyo',
+	},
+	{
+		key: 'UG:UG430',
+		label: 'Uganda — Bunyangabu',
+	},
+	{
+		key: 'UG:UG402',
+		label: 'Uganda — Bushenyi',
+	},
+	{
+		key: 'UG:UG202',
+		label: 'Uganda — Busia',
+	},
+	{
+		key: 'UG:UG221',
+		label: 'Uganda — Butaleja',
+	},
+	{
+		key: 'UG:UG119',
+		label: 'Uganda — Butambala',
+	},
+	{
+		key: 'UG:UG233',
+		label: 'Uganda — Butebo',
+	},
+	{
+		key: 'UG:UG120',
+		label: 'Uganda — Buvuma',
+	},
+	{
+		key: 'UG:UG226',
+		label: 'Uganda — Buyende',
+	},
+	{
+		key: 'UG:UG317',
+		label: 'Uganda — Dokolo',
+	},
+	{
+		key: 'UG:UG121',
+		label: 'Uganda — Gomba',
+	},
+	{
+		key: 'UG:UG304',
+		label: 'Uganda — Gulu',
+	},
+	{
+		key: 'UG:UG403',
+		label: 'Uganda — Hoima',
+	},
+	{
+		key: 'UG:UG417',
+		label: 'Uganda — Ibanda',
+	},
+	{
+		key: 'UG:UG203',
+		label: 'Uganda — Iganga',
+	},
+	{
+		key: 'UG:UG418',
+		label: 'Uganda — Isingiro',
+	},
+	{
+		key: 'UG:UG204',
+		label: 'Uganda — Jinja',
+	},
+	{
+		key: 'UG:UG318',
+		label: 'Uganda — Kaabong',
+	},
+	{
+		key: 'UG:UG404',
+		label: 'Uganda — Kabale',
+	},
+	{
+		key: 'UG:UG405',
+		label: 'Uganda — Kabarole',
+	},
+	{
+		key: 'UG:UG213',
+		label: 'Uganda — Kaberamaido',
+	},
+	{
+		key: 'UG:UG427',
+		label: 'Uganda — Kagadi',
+	},
+	{
+		key: 'UG:UG428',
+		label: 'Uganda — Kakumiro',
+	},
+	{
+		key: 'UG:UG101',
+		label: 'Uganda — Kalangala',
+	},
+	{
+		key: 'UG:UG222',
+		label: 'Uganda — Kaliro',
+	},
+	{
+		key: 'UG:UG122',
+		label: 'Uganda — Kalungu',
+	},
+	{
+		key: 'UG:UG102',
+		label: 'Uganda — Kampala',
+	},
+	{
+		key: 'UG:UG205',
+		label: 'Uganda — Kamuli',
+	},
+	{
+		key: 'UG:UG413',
+		label: 'Uganda — Kamwenge',
+	},
+	{
+		key: 'UG:UG414',
+		label: 'Uganda — Kanungu',
+	},
+	{
+		key: 'UG:UG206',
+		label: 'Uganda — Kapchorwa',
+	},
+	{
+		key: 'UG:UG236',
+		label: 'Uganda — Kapelebyong',
+	},
+	{
+		key: 'UG:UG126',
+		label: 'Uganda — Kasanda',
+	},
+	{
+		key: 'UG:UG406',
+		label: 'Uganda — Kasese',
+	},
+	{
+		key: 'UG:UG207',
+		label: 'Uganda — Katakwi',
+	},
+	{
+		key: 'UG:UG112',
+		label: 'Uganda — Kayunga',
+	},
+	{
+		key: 'UG:UG407',
+		label: 'Uganda — Kibaale',
+	},
+	{
+		key: 'UG:UG103',
+		label: 'Uganda — Kiboga',
+	},
+	{
+		key: 'UG:UG227',
+		label: 'Uganda — Kibuku',
+	},
+	{
+		key: 'UG:UG432',
+		label: 'Uganda — Kikuube',
+	},
+	{
+		key: 'UG:UG419',
+		label: 'Uganda — Kiruhura',
+	},
+	{
+		key: 'UG:UG421',
+		label: 'Uganda — Kiryandongo',
+	},
+	{
+		key: 'UG:UG408',
+		label: 'Uganda — Kisoro',
+	},
+	{
+		key: 'UG:UG305',
+		label: 'Uganda — Kitgum',
+	},
+	{
+		key: 'UG:UG319',
+		label: 'Uganda — Koboko',
+	},
+	{
+		key: 'UG:UG325',
+		label: 'Uganda — Kole',
+	},
+	{
+		key: 'UG:UG306',
+		label: 'Uganda — Kotido',
+	},
+	{
+		key: 'UG:UG208',
+		label: 'Uganda — Kumi',
+	},
+	{
+		key: 'UG:UG333',
+		label: 'Uganda — Kwania',
+	},
+	{
+		key: 'UG:UG228',
+		label: 'Uganda — Kween',
+	},
+	{
+		key: 'UG:UG123',
+		label: 'Uganda — Kyankwanzi',
+	},
+	{
+		key: 'UG:UG422',
+		label: 'Uganda — Kyegegwa',
+	},
+	{
+		key: 'UG:UG415',
+		label: 'Uganda — Kyenjojo',
+	},
+	{
+		key: 'UG:UG125',
+		label: 'Uganda — Kyotera',
+	},
+	{
+		key: 'UG:UG326',
+		label: 'Uganda — Lamwo',
+	},
+	{
+		key: 'UG:UG307',
+		label: 'Uganda — Lira',
+	},
+	{
+		key: 'UG:UG229',
+		label: 'Uganda — Luuka',
+	},
+	{
+		key: 'UG:UG104',
+		label: 'Uganda — Luwero',
+	},
+	{
+		key: 'UG:UG124',
+		label: 'Uganda — Lwengo',
+	},
+	{
+		key: 'UG:UG114',
+		label: 'Uganda — Lyantonde',
+	},
+	{
+		key: 'UG:UG223',
+		label: 'Uganda — Manafwa',
+	},
+	{
+		key: 'UG:UG320',
+		label: 'Uganda — Maracha',
+	},
+	{
+		key: 'UG:UG105',
+		label: 'Uganda — Masaka',
+	},
+	{
+		key: 'UG:UG409',
+		label: 'Uganda — Masindi',
+	},
+	{
+		key: 'UG:UG214',
+		label: 'Uganda — Mayuge',
+	},
+	{
+		key: 'UG:UG209',
+		label: 'Uganda — Mbale',
+	},
+	{
+		key: 'UG:UG410',
+		label: 'Uganda — Mbarara',
+	},
+	{
+		key: 'UG:UG423',
+		label: 'Uganda — Mitooma',
+	},
+	{
+		key: 'UG:UG115',
+		label: 'Uganda — Mityana',
+	},
+	{
+		key: 'UG:UG308',
+		label: 'Uganda — Moroto',
+	},
+	{
+		key: 'UG:UG309',
+		label: 'Uganda — Moyo',
+	},
+	{
+		key: 'UG:UG106',
+		label: 'Uganda — Mpigi',
+	},
+	{
+		key: 'UG:UG107',
+		label: 'Uganda — Mubende',
+	},
+	{
+		key: 'UG:UG108',
+		label: 'Uganda — Mukono',
+	},
+	{
+		key: 'UG:UG334',
+		label: 'Uganda — Nabilatuk',
+	},
+	{
+		key: 'UG:UG311',
+		label: 'Uganda — Nakapiripirit',
+	},
+	{
+		key: 'UG:UG116',
+		label: 'Uganda — Nakaseke',
+	},
+	{
+		key: 'UG:UG109',
+		label: 'Uganda — Nakasongola',
+	},
+	{
+		key: 'UG:UG230',
+		label: 'Uganda — Namayingo',
+	},
+	{
+		key: 'UG:UG234',
+		label: 'Uganda — Namisindwa',
+	},
+	{
+		key: 'UG:UG224',
+		label: 'Uganda — Namutumba',
+	},
+	{
+		key: 'UG:UG327',
+		label: 'Uganda — Napak',
+	},
+	{
+		key: 'UG:UG310',
+		label: 'Uganda — Nebbi',
+	},
+	{
+		key: 'UG:UG231',
+		label: 'Uganda — Ngora',
+	},
+	{
+		key: 'UG:UG424',
+		label: 'Uganda — Ntoroko',
+	},
+	{
+		key: 'UG:UG411',
+		label: 'Uganda — Ntungamo',
+	},
+	{
+		key: 'UG:UG328',
+		label: 'Uganda — Nwoya',
+	},
+	{
+		key: 'UG:UG331',
+		label: 'Uganda — Omoro',
+	},
+	{
+		key: 'UG:UG329',
+		label: 'Uganda — Otuke',
+	},
+	{
+		key: 'UG:UG321',
+		label: 'Uganda — Oyam',
+	},
+	{
+		key: 'UG:UG312',
+		label: 'Uganda — Pader',
+	},
+	{
+		key: 'UG:UG332',
+		label: 'Uganda — Pakwach',
+	},
+	{
+		key: 'UG:UG210',
+		label: 'Uganda — Pallisa',
+	},
+	{
+		key: 'UG:UG110',
+		label: 'Uganda — Rakai',
+	},
+	{
+		key: 'UG:UG429',
+		label: 'Uganda — Rubanda',
+	},
+	{
+		key: 'UG:UG425',
+		label: 'Uganda — Rubirizi',
+	},
+	{
+		key: 'UG:UG431',
+		label: 'Uganda — Rukiga',
+	},
+	{
+		key: 'UG:UG412',
+		label: 'Uganda — Rukungiri',
+	},
+	{
+		key: 'UG:UG111',
+		label: 'Uganda — Sembabule',
+	},
+	{
+		key: 'UG:UG232',
+		label: 'Uganda — Serere',
+	},
+	{
+		key: 'UG:UG426',
+		label: 'Uganda — Sheema',
+	},
+	{
+		key: 'UG:UG215',
+		label: 'Uganda — Sironko',
+	},
+	{
+		key: 'UG:UG211',
+		label: 'Uganda — Soroti',
+	},
+	{
+		key: 'UG:UG212',
+		label: 'Uganda — Tororo',
+	},
+	{
+		key: 'UG:UG113',
+		label: 'Uganda — Wakiso',
+	},
+	{
+		key: 'UG:UG313',
+		label: 'Uganda — Yumbe',
+	},
+	{
+		key: 'UG:UG330',
+		label: 'Uganda — Zombo',
+	},
+	{
+		key: 'UA:VN',
+		label: 'Ukraine — Vinnytsia Oblast',
+	},
+	{
+		key: 'UA:VL',
+		label: 'Ukraine — Volyn Oblast',
+	},
+	{
+		key: 'UA:DP',
+		label: 'Ukraine — Dnipropetrovsk Oblast',
+	},
+	{
+		key: 'UA:DT',
+		label: 'Ukraine — Donetsk Oblast',
+	},
+	{
+		key: 'UA:ZT',
+		label: 'Ukraine — Zhytomyr Oblast',
+	},
+	{
+		key: 'UA:ZK',
+		label: 'Ukraine — Zakarpattia Oblast',
+	},
+	{
+		key: 'UA:ZP',
+		label: 'Ukraine — Zaporizhzhia Oblast',
+	},
+	{
+		key: 'UA:IF',
+		label: 'Ukraine — Ivano-Frankivsk Oblast',
+	},
+	{
+		key: 'UA:KV',
+		label: 'Ukraine — Kyiv Oblast',
+	},
+	{
+		key: 'UA:KH',
+		label: 'Ukraine — Kirovohrad Oblast',
+	},
+	{
+		key: 'UA:LH',
+		label: 'Ukraine — Luhansk Oblast',
+	},
+	{
+		key: 'UA:LV',
+		label: 'Ukraine — Lviv Oblast',
+	},
+	{
+		key: 'UA:MY',
+		label: 'Ukraine — Mykolaiv Oblast',
+	},
+	{
+		key: 'UA:OD',
+		label: 'Ukraine — Odessa Oblast',
+	},
+	{
+		key: 'UA:PL',
+		label: 'Ukraine — Poltava Oblast',
+	},
+	{
+		key: 'UA:RV',
+		label: 'Ukraine — Rivne Oblast',
+	},
+	{
+		key: 'UA:SM',
+		label: 'Ukraine — Sumy Oblast',
+	},
+	{
+		key: 'UA:TP',
+		label: 'Ukraine — Ternopil Oblast',
+	},
+	{
+		key: 'UA:KK',
+		label: 'Ukraine — Kharkiv Oblast',
+	},
+	{
+		key: 'UA:KS',
+		label: 'Ukraine — Kherson Oblast',
+	},
+	{
+		key: 'UA:KM',
+		label: 'Ukraine — Khmelnytskyi Oblast',
+	},
+	{
+		key: 'UA:CK',
+		label: 'Ukraine — Cherkasy Oblast',
+	},
+	{
+		key: 'UA:CH',
+		label: 'Ukraine — Chernihiv Oblast',
+	},
+	{
+		key: 'UA:CV',
+		label: 'Ukraine — Chernivtsi Oblast',
+	},
+	{
+		key: 'AE',
+		label: 'United Arab Emirates',
+	},
+	{
+		key: 'GB',
+		label: 'United Kingdom (UK)',
+	},
+	{
+		key: 'US:AL',
+		label: 'United States (US) — Alabama',
+	},
+	{
+		key: 'US:AK',
+		label: 'United States (US) — Alaska',
+	},
+	{
+		key: 'US:AZ',
+		label: 'United States (US) — Arizona',
+	},
+	{
+		key: 'US:AR',
+		label: 'United States (US) — Arkansas',
+	},
+	{
+		key: 'US:CA',
+		label: 'United States (US) — California',
+	},
+	{
+		key: 'US:CO',
+		label: 'United States (US) — Colorado',
+	},
+	{
+		key: 'US:CT',
+		label: 'United States (US) — Connecticut',
+	},
+	{
+		key: 'US:DE',
+		label: 'United States (US) — Delaware',
+	},
+	{
+		key: 'US:DC',
+		label: 'United States (US) — District Of Columbia',
+	},
+	{
+		key: 'US:FL',
+		label: 'United States (US) — Florida',
+	},
+	{
+		key: 'US:GA',
+		label: 'United States (US) — Georgia',
+	},
+	{
+		key: 'US:HI',
+		label: 'United States (US) — Hawaii',
+	},
+	{
+		key: 'US:ID',
+		label: 'United States (US) — Idaho',
+	},
+	{
+		key: 'US:IL',
+		label: 'United States (US) — Illinois',
+	},
+	{
+		key: 'US:IN',
+		label: 'United States (US) — Indiana',
+	},
+	{
+		key: 'US:IA',
+		label: 'United States (US) — Iowa',
+	},
+	{
+		key: 'US:KS',
+		label: 'United States (US) — Kansas',
+	},
+	{
+		key: 'US:KY',
+		label: 'United States (US) — Kentucky',
+	},
+	{
+		key: 'US:LA',
+		label: 'United States (US) — Louisiana',
+	},
+	{
+		key: 'US:ME',
+		label: 'United States (US) — Maine',
+	},
+	{
+		key: 'US:MD',
+		label: 'United States (US) — Maryland',
+	},
+	{
+		key: 'US:MA',
+		label: 'United States (US) — Massachusetts',
+	},
+	{
+		key: 'US:MI',
+		label: 'United States (US) — Michigan',
+	},
+	{
+		key: 'US:MN',
+		label: 'United States (US) — Minnesota',
+	},
+	{
+		key: 'US:MS',
+		label: 'United States (US) — Mississippi',
+	},
+	{
+		key: 'US:MO',
+		label: 'United States (US) — Missouri',
+	},
+	{
+		key: 'US:MT',
+		label: 'United States (US) — Montana',
+	},
+	{
+		key: 'US:NE',
+		label: 'United States (US) — Nebraska',
+	},
+	{
+		key: 'US:NV',
+		label: 'United States (US) — Nevada',
+	},
+	{
+		key: 'US:NH',
+		label: 'United States (US) — New Hampshire',
+	},
+	{
+		key: 'US:NJ',
+		label: 'United States (US) — New Jersey',
+	},
+	{
+		key: 'US:NM',
+		label: 'United States (US) — New Mexico',
+	},
+	{
+		key: 'US:NY',
+		label: 'United States (US) — New York',
+	},
+	{
+		key: 'US:NC',
+		label: 'United States (US) — North Carolina',
+	},
+	{
+		key: 'US:ND',
+		label: 'United States (US) — North Dakota',
+	},
+	{
+		key: 'US:OH',
+		label: 'United States (US) — Ohio',
+	},
+	{
+		key: 'US:OK',
+		label: 'United States (US) — Oklahoma',
+	},
+	{
+		key: 'US:OR',
+		label: 'United States (US) — Oregon',
+	},
+	{
+		key: 'US:PA',
+		label: 'United States (US) — Pennsylvania',
+	},
+	{
+		key: 'US:RI',
+		label: 'United States (US) — Rhode Island',
+	},
+	{
+		key: 'US:SC',
+		label: 'United States (US) — South Carolina',
+	},
+	{
+		key: 'US:SD',
+		label: 'United States (US) — South Dakota',
+	},
+	{
+		key: 'US:TN',
+		label: 'United States (US) — Tennessee',
+	},
+	{
+		key: 'US:TX',
+		label: 'United States (US) — Texas',
+	},
+	{
+		key: 'US:UT',
+		label: 'United States (US) — Utah',
+	},
+	{
+		key: 'US:VT',
+		label: 'United States (US) — Vermont',
+	},
+	{
+		key: 'US:VA',
+		label: 'United States (US) — Virginia',
+	},
+	{
+		key: 'US:WA',
+		label: 'United States (US) — Washington',
+	},
+	{
+		key: 'US:WV',
+		label: 'United States (US) — West Virginia',
+	},
+	{
+		key: 'US:WI',
+		label: 'United States (US) — Wisconsin',
+	},
+	{
+		key: 'US:WY',
+		label: 'United States (US) — Wyoming',
+	},
+	{
+		key: 'US:AA',
+		label: 'United States (US) — Armed Forces (AA)',
+	},
+	{
+		key: 'US:AE',
+		label: 'United States (US) — Armed Forces (AE)',
+	},
+	{
+		key: 'US:AP',
+		label: 'United States (US) — Armed Forces (AP)',
+	},
+	{
+		key: 'UM:81',
+		label: 'United States (US) Minor Outlying Islands — Baker Island',
+	},
+	{
+		key: 'UM:84',
+		label: 'United States (US) Minor Outlying Islands — Howland Island',
+	},
+	{
+		key: 'UM:86',
+		label: 'United States (US) Minor Outlying Islands — Jarvis Island',
+	},
+	{
+		key: 'UM:67',
+		label: 'United States (US) Minor Outlying Islands — Johnston Atoll',
+	},
+	{
+		key: 'UM:89',
+		label: 'United States (US) Minor Outlying Islands — Kingman Reef',
+	},
+	{
+		key: 'UM:71',
+		label: 'United States (US) Minor Outlying Islands — Midway Atoll',
+	},
+	{
+		key: 'UM:76',
+		label: 'United States (US) Minor Outlying Islands — Navassa Island',
+	},
+	{
+		key: 'UM:95',
+		label: 'United States (US) Minor Outlying Islands — Palmyra Atoll',
+	},
+	{
+		key: 'UM:79',
+		label: 'United States (US) Minor Outlying Islands — Wake Island',
+	},
+	{
+		key: 'UY:UY-AR',
+		label: 'Uruguay — Artigas',
+	},
+	{
+		key: 'UY:UY-CA',
+		label: 'Uruguay — Canelones',
+	},
+	{
+		key: 'UY:UY-CL',
+		label: 'Uruguay — Cerro Largo',
+	},
+	{
+		key: 'UY:UY-CO',
+		label: 'Uruguay — Colonia',
+	},
+	{
+		key: 'UY:UY-DU',
+		label: 'Uruguay — Durazno',
+	},
+	{
+		key: 'UY:UY-FS',
+		label: 'Uruguay — Flores',
+	},
+	{
+		key: 'UY:UY-FD',
+		label: 'Uruguay — Florida',
+	},
+	{
+		key: 'UY:UY-LA',
+		label: 'Uruguay — Lavalleja',
+	},
+	{
+		key: 'UY:UY-MA',
+		label: 'Uruguay — Maldonado',
+	},
+	{
+		key: 'UY:UY-MO',
+		label: 'Uruguay — Montevideo',
+	},
+	{
+		key: 'UY:UY-PA',
+		label: 'Uruguay — Paysandú',
+	},
+	{
+		key: 'UY:UY-RN',
+		label: 'Uruguay — Río Negro',
+	},
+	{
+		key: 'UY:UY-RV',
+		label: 'Uruguay — Rivera',
+	},
+	{
+		key: 'UY:UY-RO',
+		label: 'Uruguay — Rocha',
+	},
+	{
+		key: 'UY:UY-SA',
+		label: 'Uruguay — Salto',
+	},
+	{
+		key: 'UY:UY-SJ',
+		label: 'Uruguay — San José',
+	},
+	{
+		key: 'UY:UY-SO',
+		label: 'Uruguay — Soriano',
+	},
+	{
+		key: 'UY:UY-TA',
+		label: 'Uruguay — Tacuarembó',
+	},
+	{
+		key: 'UY:UY-TT',
+		label: 'Uruguay — Treinta y Tres',
+	},
+	{
+		key: 'UZ',
+		label: 'Uzbekistan',
+	},
+	{
+		key: 'VU',
+		label: 'Vanuatu',
+	},
+	{
+		key: 'VA',
+		label: 'Vatican',
+	},
+	{
+		key: 'VE:VE-A',
+		label: 'Venezuela — Capital',
+	},
+	{
+		key: 'VE:VE-B',
+		label: 'Venezuela — Anzoátegui',
+	},
+	{
+		key: 'VE:VE-C',
+		label: 'Venezuela — Apure',
+	},
+	{
+		key: 'VE:VE-D',
+		label: 'Venezuela — Aragua',
+	},
+	{
+		key: 'VE:VE-E',
+		label: 'Venezuela — Barinas',
+	},
+	{
+		key: 'VE:VE-F',
+		label: 'Venezuela — Bolívar',
+	},
+	{
+		key: 'VE:VE-G',
+		label: 'Venezuela — Carabobo',
+	},
+	{
+		key: 'VE:VE-H',
+		label: 'Venezuela — Cojedes',
+	},
+	{
+		key: 'VE:VE-I',
+		label: 'Venezuela — Falcón',
+	},
+	{
+		key: 'VE:VE-J',
+		label: 'Venezuela — Guárico',
+	},
+	{
+		key: 'VE:VE-K',
+		label: 'Venezuela — Lara',
+	},
+	{
+		key: 'VE:VE-L',
+		label: 'Venezuela — Mérida',
+	},
+	{
+		key: 'VE:VE-M',
+		label: 'Venezuela — Miranda',
+	},
+	{
+		key: 'VE:VE-N',
+		label: 'Venezuela — Monagas',
+	},
+	{
+		key: 'VE:VE-O',
+		label: 'Venezuela — Nueva Esparta',
+	},
+	{
+		key: 'VE:VE-P',
+		label: 'Venezuela — Portuguesa',
+	},
+	{
+		key: 'VE:VE-R',
+		label: 'Venezuela — Sucre',
+	},
+	{
+		key: 'VE:VE-S',
+		label: 'Venezuela — Táchira',
+	},
+	{
+		key: 'VE:VE-T',
+		label: 'Venezuela — Trujillo',
+	},
+	{
+		key: 'VE:VE-U',
+		label: 'Venezuela — Yaracuy',
+	},
+	{
+		key: 'VE:VE-V',
+		label: 'Venezuela — Zulia',
+	},
+	{
+		key: 'VE:VE-W',
+		label: 'Venezuela — Federal Dependencies',
+	},
+	{
+		key: 'VE:VE-X',
+		label: 'Venezuela — La Guaira (Vargas)',
+	},
+	{
+		key: 'VE:VE-Y',
+		label: 'Venezuela — Delta Amacuro',
+	},
+	{
+		key: 'VE:VE-Z',
+		label: 'Venezuela — Amazonas',
+	},
+	{
+		key: 'VN',
+		label: 'Vietnam',
+	},
+	{
+		key: 'VG',
+		label: 'Virgin Islands (British)',
+	},
+	{
+		key: 'VI',
+		label: 'Virgin Islands (US)',
+	},
+	{
+		key: 'WF',
+		label: 'Wallis and Futuna',
+	},
+	{
+		key: 'EH',
+		label: 'Western Sahara',
+	},
+	{
+		key: 'YE',
+		label: 'Yemen',
+	},
+	{
+		key: 'ZM:ZM-01',
+		label: 'Zambia — Western',
+	},
+	{
+		key: 'ZM:ZM-02',
+		label: 'Zambia — Central',
+	},
+	{
+		key: 'ZM:ZM-03',
+		label: 'Zambia — Eastern',
+	},
+	{
+		key: 'ZM:ZM-04',
+		label: 'Zambia — Luapula',
+	},
+	{
+		key: 'ZM:ZM-05',
+		label: 'Zambia — Northern',
+	},
+	{
+		key: 'ZM:ZM-06',
+		label: 'Zambia — North-Western',
+	},
+	{
+		key: 'ZM:ZM-07',
+		label: 'Zambia — Southern',
+	},
+	{
+		key: 'ZM:ZM-08',
+		label: 'Zambia — Copperbelt',
+	},
+	{
+		key: 'ZM:ZM-09',
+		label: 'Zambia — Lusaka',
+	},
+	{
+		key: 'ZM:ZM-10',
+		label: 'Zambia — Muchinga',
+	},
+	{
+		key: 'ZW',
+		label: 'Zimbabwe',
+	},
+];
diff --git a/packages/js/onboarding/src/utils/countries/tests/utils/index.test.ts b/packages/js/onboarding/src/utils/countries/tests/utils/index.test.ts
new file mode 100644
index 00000000000..cb3546d99ec
--- /dev/null
+++ b/packages/js/onboarding/src/utils/countries/tests/utils/index.test.ts
@@ -0,0 +1,96 @@
+/* eslint-disable camelcase */
+/* eslint-disable no-undef */
+
+/**
+ * Internal dependencies
+ */
+import { findCountryOption } from '../../';
+import { countryStateOptions } from './country-options';
+import { locations } from './locations';
+
+describe( 'findCountryOption', () => {
+	it( 'should return null on undefined location', () => {
+		const location = undefined;
+		expect( findCountryOption( countryStateOptions, location ) ).toEqual(
+			null
+		);
+	} );
+
+	it( 'should return null when not found', () => {
+		const location = { country_short: 'US' };
+		expect( findCountryOption( countryStateOptions, location ) ).toBeNull();
+	} );
+
+	it.each( [
+		{
+			location: { country_short: 'TW' },
+			expected: {
+				key: 'TW',
+				label: 'Taiwan',
+			},
+		},
+		{
+			location: { country_short: 'US', region: 'California' },
+			expected: {
+				key: 'US:CA',
+				label: 'United States (US) — California',
+			},
+		},
+		{
+			location: { country_short: 'ES', region: 'Madrid, Comunidad de' },
+			expected: {
+				key: 'ES:M',
+				label: 'Spain — Madrid',
+			},
+		},
+		{
+			location: {
+				country_short: 'AR',
+				region: 'Ciudad Autonoma de Buenos Aires',
+			},
+			expected: {
+				key: 'AR:C',
+				label: 'Argentina — Ciudad Autónoma de Buenos Aires',
+			},
+		},
+		{
+			location: {
+				country_short: 'IT',
+				region: 'Lazio',
+				city: 'Rome',
+			},
+			expected: {
+				key: 'IT:RM',
+				label: 'Italy — Roma',
+			},
+		},
+		{
+			location: {
+				country_short: 'PH',
+				region: 'National Capital Region',
+				city: 'Makati',
+			},
+			expected: {
+				key: 'PH:00',
+				label: 'Philippines — Metro Manila',
+			},
+		},
+	] )(
+		'should return the country option for location $expected',
+		( { location, expected } ) => {
+			expect(
+				findCountryOption( countryStateOptions, location, 0.4 )
+			).toEqual( expected );
+		}
+	);
+
+	it( 'should return a country option for > 98% locations', () => {
+		let matchCount = 0;
+		locations.forEach( ( location ) => {
+			if ( findCountryOption( countryStateOptions, location, 0.4 ) ) {
+				matchCount++;
+			}
+		} );
+		expect( matchCount / locations.length ).toBeGreaterThan( 0.98 );
+	} );
+} );
diff --git a/packages/js/onboarding/src/utils/countries/tests/utils/location-mapping.test.ts b/packages/js/onboarding/src/utils/countries/tests/utils/location-mapping.test.ts
new file mode 100644
index 00000000000..bca1ea20330
--- /dev/null
+++ b/packages/js/onboarding/src/utils/countries/tests/utils/location-mapping.test.ts
@@ -0,0 +1,41 @@
+/* eslint-disable camelcase */
+
+/**
+ * Internal dependencies
+ */
+import { getMappingRegion } from '../../location-mapping';
+
+describe( 'getMappingRegion', () => {
+	it( 'should return null for an empty location', () => {
+		expect( getMappingRegion( {} ) ).toBeNull();
+	} );
+
+	it( 'should return null for a location that is not in the mapping', () => {
+		expect(
+			getMappingRegion( { country_short: 'US', region: 'California' } )
+		).toBeNull();
+	} );
+
+	it( 'should return null for a location with no region', () => {
+		expect( getMappingRegion( { country_short: 'PH' } ) ).toBeNull();
+	} );
+
+	it( 'should return the region for a location that is in the mapping with a region', () => {
+		expect(
+			getMappingRegion( {
+				country_short: 'PH',
+				region: 'National Capital Region',
+			} )
+		).toBe( 'Metro Manila' );
+	} );
+
+	it( 'should return the region for a location that is in the mapping with a city', () => {
+		expect(
+			getMappingRegion( {
+				country_short: 'IT',
+				region: 'Lazio',
+				city: 'Rome',
+			} )
+		).toBe( 'Roma' );
+	} );
+} );
diff --git a/packages/js/onboarding/src/utils/countries/tests/utils/locations.ts b/packages/js/onboarding/src/utils/countries/tests/utils/locations.ts
new file mode 100644
index 00000000000..5a40af0bd63
--- /dev/null
+++ b/packages/js/onboarding/src/utils/countries/tests/utils/locations.ts
@@ -0,0 +1,17862 @@
+export const locations = [
+	{
+		country_short: 'US',
+		region: 'California',
+		city: 'Los Angeles',
+	},
+	{
+		country_short: 'CN',
+		region: 'Fujian',
+		city: 'Fuzhou',
+	},
+	{
+		country_short: 'AU',
+		region: 'Tasmania',
+		city: 'Glebe',
+	},
+	{
+		country_short: 'AU',
+		region: 'Victoria',
+		city: 'Melbourne',
+	},
+	{
+		country_short: 'CN',
+		region: 'Guangdong',
+		city: 'Guangzhou',
+	},
+	{
+		country_short: 'JP',
+		region: 'Tokyo',
+		city: 'Tokyo',
+	},
+	{
+		country_short: 'JP',
+		region: 'Hiroshima',
+		city: 'Hiroshima',
+	},
+	{
+		country_short: 'JP',
+		region: 'Miyagi',
+		city: 'Sendai',
+	},
+	{
+		country_short: 'JP',
+		region: 'Shimane',
+		city: 'Izumo',
+	},
+	{
+		country_short: 'JP',
+		region: 'Yamaguchi',
+		city: 'Yamaguchi',
+	},
+	{
+		country_short: 'JP',
+		region: 'Tottori',
+		city: 'Kurayoshi',
+	},
+	{
+		country_short: 'JP',
+		region: 'Okayama',
+		city: 'Okayama',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chiang Rai',
+		city: 'Pa Daet',
+	},
+	{
+		country_short: 'TH',
+		region: 'Krung Thep Maha Nakhon',
+		city: 'Bangkok',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phetchaburi',
+		city: 'Phetchaburi',
+	},
+	{
+		country_short: 'TH',
+		region: 'Songkhla',
+		city: 'Songkhla',
+	},
+	{
+		country_short: 'TH',
+		region: 'Suphan Buri',
+		city: 'Don Chedi',
+	},
+	{
+		country_short: 'TH',
+		region: 'Lop Buri',
+		city: 'Phatthana Nikhom',
+	},
+	{
+		country_short: 'TH',
+		region: 'Ratchaburi',
+		city: 'Ratchaburi',
+	},
+	{
+		country_short: 'TH',
+		region: 'Trang',
+		city: 'Ratsada',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nakhon Sawan',
+		city: 'Takhli',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chanthaburi',
+		city: 'Laem Sing',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chon Buri',
+		city: 'Chon Buri',
+	},
+	{
+		country_short: 'TH',
+		region: 'Surat Thani',
+		city: 'Ko Samui',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phangnga',
+		city: 'Kapong',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chumphon',
+		city: 'Chumphon',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nakhon Si Thammarat',
+		city: 'Thung Song',
+	},
+	{
+		country_short: 'TH',
+		region: 'Krabi',
+		city: 'Ao Luek',
+	},
+	{
+		country_short: 'TH',
+		region: 'Ranong',
+		city: 'Kra Buri',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phatthalung',
+		city: 'Srinagarindra',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chiang Mai',
+		city: 'San Pa Tong',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chachoengsao',
+		city: 'Bang Pakong',
+	},
+	{
+		country_short: 'TH',
+		region: 'Rayong',
+		city: 'Klaeng',
+	},
+	{
+		country_short: 'TH',
+		region: 'Sa Kaeo',
+		city: 'Aranyaprathet',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phuket',
+		city: 'Phuket',
+	},
+	{
+		country_short: 'TH',
+		region: 'Samut Prakan',
+		city: 'Phra Pradaeng',
+	},
+	{
+		country_short: 'TH',
+		region: 'Kamphaeng Phet',
+		city: 'Pang Sila Thong',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phetchabun',
+		city: 'Lom Kao',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phra Nakhon Si Ayutthaya',
+		city: 'Nakhon Luang',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nakhon Pathom',
+		city: 'Sam Phran',
+	},
+	{
+		country_short: 'TH',
+		region: 'Narathiwat',
+		city: 'Tak Bai',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nan',
+		city: 'Phu Phiang',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nakhon Phanom',
+		city: 'Renu Nakhon',
+	},
+	{
+		country_short: 'TH',
+		region: 'Udon Thani',
+		city: 'Udon Thani',
+	},
+	{
+		country_short: 'TH',
+		region: 'Kalasin',
+		city: 'Kuchinarai',
+	},
+	{
+		country_short: 'TH',
+		region: 'Loei',
+		city: 'Wang Saphung',
+	},
+	{
+		country_short: 'TH',
+		region: 'Bueng Kan',
+		city: 'Ban Mai Phatthana',
+	},
+	{
+		country_short: 'TH',
+		region: 'Yala',
+		city: 'Yala',
+	},
+	{
+		country_short: 'TH',
+		region: 'Pattani',
+		city: 'Mae Lan',
+	},
+	{
+		country_short: 'CN',
+		region: 'Shanghai',
+		city: 'Shanghai',
+	},
+	{
+		country_short: 'TH',
+		region: 'Sakon Nakhon',
+		city: 'Wanon Niwat',
+	},
+	{
+		country_short: 'TH',
+		region: 'Roi Et',
+		city: 'Roi Et',
+	},
+	{
+		country_short: 'TH',
+		region: 'Mukdahan',
+		city: 'Khamcha-i',
+	},
+	{
+		country_short: 'TH',
+		region: 'Khon Kaen',
+		city: 'Khon Kaen',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phrae',
+		city: 'Sung Men',
+	},
+	{
+		country_short: 'TH',
+		region: 'Lamphun',
+		city: 'Mae Tha',
+	},
+	{
+		country_short: 'TH',
+		region: 'Pathum Thani',
+		city: 'Ban Lam Luk Ka',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nonthaburi',
+		city: 'Mueang Nonthaburi',
+	},
+	{
+		country_short: 'TH',
+		region: 'Yasothon',
+		city: 'Yasothon',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nakhon Ratchasima',
+		city: 'Nakhon Ratchasima',
+	},
+	{
+		country_short: 'TH',
+		region: 'Trat',
+		city: 'Laem Ngop',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nong Bua Lam Phu',
+		city: 'Si Bun Rueang',
+	},
+	{
+		country_short: 'TH',
+		region: 'Amnat Charoen',
+		city: 'Hua Taphan',
+	},
+	{
+		country_short: 'TH',
+		region: 'Maha Sarakham',
+		city: 'Maha Sarakham',
+	},
+	{
+		country_short: 'TH',
+		region: 'Lampang',
+		city: 'Ngao',
+	},
+	{
+		country_short: 'TH',
+		region: 'Prachuap Khiri Khan',
+		city: 'Bang Saphan Noi',
+	},
+	{
+		country_short: 'TH',
+		region: 'Si Sa Ket',
+		city: 'Huai Thap Than',
+	},
+	{
+		country_short: 'TH',
+		region: 'Prachin Buri',
+		city: 'Prachin Buri',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phitsanulok',
+		city: 'Phitsanulok',
+	},
+	{
+		country_short: 'TH',
+		region: 'Buri Ram',
+		city: 'Prakhon Chai',
+	},
+	{
+		country_short: 'CN',
+		region: 'Beijing',
+		city: 'Beijing',
+	},
+	{
+		country_short: 'AU',
+		region: 'Queensland',
+		city: 'Brisbane',
+	},
+	{
+		country_short: 'TH',
+		region: 'Uttaradit',
+		city: 'Uttaradit',
+	},
+	{
+		country_short: 'TH',
+		region: 'Satun',
+		city: 'Satun',
+	},
+	{
+		country_short: 'TH',
+		region: 'Uthai Thani',
+		city: 'Uthai Thani',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phayao',
+		city: 'Phayao',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nong Khai',
+		city: 'Nong Khai',
+	},
+	{
+		country_short: 'TH',
+		region: 'Tak',
+		city: 'Umphang',
+	},
+	{
+		country_short: 'TH',
+		region: 'Phichit',
+		city: 'Taphan Hin',
+	},
+	{
+		country_short: 'TH',
+		region: 'Samut Songkhram',
+		city: 'Samut Songkhram',
+	},
+	{
+		country_short: 'TH',
+		region: 'Samut Sakhon',
+		city: 'Krathum Baen',
+	},
+	{
+		country_short: 'TH',
+		region: 'Ubon Ratchathani',
+		city: 'Na Chaluai',
+	},
+	{
+		country_short: 'JP',
+		region: 'Gifu',
+		city: 'Gifu',
+	},
+	{
+		country_short: 'IN',
+		region: 'Karnataka',
+		city: 'Bengaluru',
+	},
+	{
+		country_short: 'IN',
+		region: 'Tamil Nadu',
+		city: 'Chennai',
+	},
+	{
+		country_short: 'IN',
+		region: 'Maharashtra',
+		city: 'Mumbai',
+	},
+	{
+		country_short: 'IN',
+		region: 'Chandigarh',
+		city: 'Chandigarh',
+	},
+	{
+		country_short: 'IN',
+		region: 'West Bengal',
+		city: 'Kolkata',
+	},
+	{
+		country_short: 'IN',
+		region: 'Haryana',
+		city: 'Gurgaon',
+	},
+	{
+		country_short: 'IN',
+		region: 'Madhya Pradesh',
+		city: 'Bhopal',
+	},
+	{
+		country_short: 'IN',
+		region: 'Delhi',
+		city: 'Delhi',
+	},
+	{
+		country_short: 'IN',
+		region: 'Jharkhand',
+		city: 'Jamshedpur',
+	},
+	{
+		country_short: 'IN',
+		region: 'Bihar',
+		city: 'Patna',
+	},
+	{
+		country_short: 'IN',
+		region: 'Odisha',
+		city: 'Bhubaneshwar',
+	},
+	{
+		country_short: 'IN',
+		region: 'Mizoram',
+		city: 'Aizawl',
+	},
+	{
+		country_short: 'IN',
+		region: 'Gujarat',
+		city: 'Kathor',
+	},
+	{
+		country_short: 'MY',
+		region: 'Selangor',
+		city: 'Shah Alam',
+	},
+	{
+		country_short: 'MY',
+		region: 'Wilayah Persekutuan Kuala Lumpur',
+		city: 'Kuala Lumpur',
+	},
+	{
+		country_short: 'MY',
+		region: 'Negeri Sembilan',
+		city: 'Bahau',
+	},
+	{
+		country_short: 'MY',
+		region: 'Sarawak',
+		city: 'Kuching',
+	},
+	{
+		country_short: 'MY',
+		region: 'Sabah',
+		city: 'Bandar Labuan',
+	},
+	{
+		country_short: 'MY',
+		region: 'Johor',
+		city: 'Johor Bahru',
+	},
+	{
+		country_short: 'MY',
+		region: 'Kedah',
+		city: 'Pulau Langkawi',
+	},
+	{
+		country_short: 'MY',
+		region: 'Pulau Pinang',
+		city: 'George Town',
+	},
+	{
+		country_short: 'MY',
+		region: 'Perak',
+		city: 'Ipoh',
+	},
+	{
+		country_short: 'MY',
+		region: 'Terengganu',
+		city: 'Kuala Terengganu',
+	},
+	{
+		country_short: 'MY',
+		region: 'Melaka',
+		city: 'Melaka',
+	},
+	{
+		country_short: 'MY',
+		region: 'Pahang',
+		city: 'Bentong Town',
+	},
+	{
+		country_short: 'MY',
+		region: 'Kelantan',
+		city: 'Peringat',
+	},
+	{
+		country_short: 'TH',
+		region: 'Mae Hong Son',
+		city: 'Mae Hong Son',
+	},
+	{
+		country_short: 'TH',
+		region: 'Kanchanaburi',
+		city: 'Nong Prue',
+	},
+	{
+		country_short: 'TH',
+		region: 'Sing Buri',
+		city: 'Sing Buri',
+	},
+	{
+		country_short: 'TH',
+		region: 'Surin',
+		city: 'Lamduan',
+	},
+	{
+		country_short: 'TH',
+		region: 'Saraburi',
+		city: 'Wang Muang',
+	},
+	{
+		country_short: 'KR',
+		region: 'Seoul-teukbyeolsi',
+		city: 'Seoul',
+	},
+	{
+		country_short: 'KR',
+		region: 'Incheon-gwangyeoksi',
+		city: 'Namdong',
+	},
+	{
+		country_short: 'KR',
+		region: 'Gyeonggi-do',
+		city: 'Bucheon',
+	},
+	{
+		country_short: 'KR',
+		region: 'Chungcheongnam-do',
+		city: 'Dangjin',
+	},
+	{
+		country_short: 'KR',
+		region: 'Gwangju-gwangyeoksi',
+		city: 'Gwangju',
+	},
+	{
+		country_short: 'CN',
+		region: 'Henan',
+		city: 'Zhengzhou',
+	},
+	{
+		country_short: 'KR',
+		region: 'Jeollanam-do',
+		city: 'Naju',
+	},
+	{
+		country_short: 'TH',
+		region: 'Nakhon Nayok',
+		city: 'Ongkharak',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chai Nat',
+		city: 'Sapphaya',
+	},
+	{
+		country_short: 'TH',
+		region: 'Sukhothai',
+		city: 'Sukhothai',
+	},
+	{
+		country_short: 'TH',
+		region: 'Ang Thong',
+		city: 'Ang Thong',
+	},
+	{
+		country_short: 'JP',
+		region: 'Kochi',
+		city: 'Aki',
+	},
+	{
+		country_short: 'JP',
+		region: 'Aichi',
+		city: 'Nagoya',
+	},
+	{
+		country_short: 'JP',
+		region: 'Saitama',
+		city: 'Saitama',
+	},
+	{
+		country_short: 'JP',
+		region: 'Osaka',
+		city: 'Osaka',
+	},
+	{
+		country_short: 'JP',
+		region: 'Ibaraki',
+		city: 'Tsukuba',
+	},
+	{
+		country_short: 'JP',
+		region: 'Kyoto',
+		city: 'Kyoto',
+	},
+	{
+		country_short: 'JP',
+		region: 'Fukuoka',
+		city: 'Fukuoka',
+	},
+	{
+		country_short: 'JP',
+		region: 'Kanagawa',
+		city: 'Yokohama',
+	},
+	{
+		country_short: 'JP',
+		region: 'Hokkaido',
+		city: 'Sapporo',
+	},
+	{
+		country_short: 'IN',
+		region: 'Uttar Pradesh',
+		city: 'Noida',
+	},
+	{
+		country_short: 'IN',
+		region: 'Andhra Pradesh',
+		city: 'Vepagunta',
+	},
+	{
+		country_short: 'IN',
+		region: 'Telangana',
+		city: 'Hyderabad',
+	},
+	{
+		country_short: 'IN',
+		region: 'Rajasthan',
+		city: 'Jaipur',
+	},
+	{
+		country_short: 'IN',
+		region: 'Chhattisgarh',
+		city: 'Raipur',
+	},
+	{
+		country_short: 'IN',
+		region: 'Kerala',
+		city: 'Changanacheri',
+	},
+	{
+		country_short: 'CN',
+		region: 'Nei Mongol',
+		city: 'Baotou',
+	},
+	{
+		country_short: 'MY',
+		region: 'Wilayah Persekutuan Putrajaya',
+		city: 'Putrajaya',
+	},
+	{
+		country_short: 'SG',
+		region: 'Singapore',
+		city: 'Singapore',
+	},
+	{
+		country_short: 'HK',
+		region: 'Hong Kong',
+		city: 'Hong Kong',
+	},
+	{
+		country_short: 'TW',
+		region: 'Taichung',
+		city: 'Taichung',
+	},
+	{
+		country_short: 'TW',
+		region: 'Taipei',
+		city: 'Taipei',
+	},
+	{
+		country_short: 'KH',
+		region: 'Phnom Penh',
+		city: 'Phnom Penh',
+	},
+	{
+		country_short: 'JP',
+		region: 'Shizuoka',
+		city: 'Hamamatsu',
+	},
+	{
+		country_short: 'JP',
+		region: 'Chiba',
+		city: 'Chiba',
+	},
+	{
+		country_short: 'JP',
+		region: 'Yamanashi',
+		city: 'Kofu',
+	},
+	{
+		country_short: 'JP',
+		region: 'Akita',
+		city: 'Akita',
+	},
+	{
+		country_short: 'JP',
+		region: 'Iwate',
+		city: 'Ichinoseki',
+	},
+	{
+		country_short: 'JP',
+		region: 'Nagano',
+		city: 'Matsumoto',
+	},
+	{
+		country_short: 'JP',
+		region: 'Niigata',
+		city: 'Niigata',
+	},
+	{
+		country_short: 'JP',
+		region: 'Fukushima',
+		city: 'Shirakawa',
+	},
+	{
+		country_short: 'JP',
+		region: 'Tochigi',
+		city: 'Utsunomiya',
+	},
+	{
+		country_short: 'JP',
+		region: 'Gunma',
+		city: 'Maebashi',
+	},
+	{
+		country_short: 'JP',
+		region: 'Hyogo',
+		city: 'Amagasaki',
+	},
+	{
+		country_short: 'JP',
+		region: 'Yamagata',
+		city: 'Sakata',
+	},
+	{
+		country_short: 'JP',
+		region: 'Nagasaki',
+		city: 'Nagasaki',
+	},
+	{
+		country_short: 'JP',
+		region: 'Saga',
+		city: 'Karatsu',
+	},
+	{
+		country_short: 'JP',
+		region: 'Aomori',
+		city: 'Aomori',
+	},
+	{
+		country_short: 'JP',
+		region: 'Toyama',
+		city: 'Namerikawa',
+	},
+	{
+		country_short: 'JP',
+		region: 'Okinawa',
+		city: 'Naha',
+	},
+	{
+		country_short: 'JP',
+		region: 'Nara',
+		city: 'Gose',
+	},
+	{
+		country_short: 'JP',
+		region: 'Tokushima',
+		city: 'Tokushima',
+	},
+	{
+		country_short: 'JP',
+		region: 'Miyazaki',
+		city: 'Miyazaki',
+	},
+	{
+		country_short: 'JP',
+		region: 'Kagoshima',
+		city: 'Amami',
+	},
+	{
+		country_short: 'JP',
+		region: 'Mie',
+		city: 'Tsu',
+	},
+	{
+		country_short: 'JP',
+		region: 'Ehime',
+		city: 'Saijo',
+	},
+	{
+		country_short: 'JP',
+		region: 'Fukui',
+		city: 'Fukui',
+	},
+	{
+		country_short: 'JP',
+		region: 'Wakayama',
+		city: 'Wakayama',
+	},
+	{
+		country_short: 'BR',
+		region: 'Ceara',
+		city: 'Fortaleza',
+	},
+	{
+		country_short: 'JP',
+		region: 'Kumamoto',
+		city: 'Kumamoto',
+	},
+	{
+		country_short: 'TW',
+		region: 'New Taipei',
+		city: 'Banqiao',
+	},
+	{
+		country_short: 'TW',
+		region: 'Taoyuan',
+		city: 'Taoyuan',
+	},
+	{
+		country_short: 'TW',
+		region: 'Hsinchu',
+		city: 'Hsinchu',
+	},
+	{
+		country_short: 'TW',
+		region: 'Keelung',
+		city: 'Keelung',
+	},
+	{
+		country_short: 'PH',
+		region: 'Tarlac',
+		city: 'Salcedo',
+	},
+	{
+		country_short: 'PH',
+		region: 'Iloilo',
+		city: 'Iloilo',
+	},
+	{
+		country_short: 'PH',
+		region: 'National Capital Region',
+		city: 'Makati',
+	},
+	{
+		country_short: 'PH',
+		region: 'Sulu',
+		city: 'Anuling',
+	},
+	{
+		country_short: 'PH',
+		region: 'Agusan del Sur',
+		city: 'Alegria',
+	},
+	{
+		country_short: 'PH',
+		region: 'Pampanga',
+		city: 'Arayat',
+	},
+	{
+		country_short: 'PH',
+		region: 'Pangasinan',
+		city: 'Tagudin',
+	},
+	{
+		country_short: 'PH',
+		region: 'Leyte',
+		city: 'Tanauan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Palawan',
+		city: 'Puerto Princesa',
+	},
+	{
+		country_short: 'IN',
+		region: 'Goa',
+		city: 'Panaji',
+	},
+	{
+		country_short: 'IN',
+		region: 'Manipur',
+		city: 'Imphal',
+	},
+	{
+		country_short: 'IN',
+		region: 'Assam',
+		city: 'Dimapur',
+	},
+	{
+		country_short: 'IN',
+		region: 'Tripura',
+		city: 'Agartala',
+	},
+	{
+		country_short: 'IN',
+		region: 'Puducherry',
+		city: 'Puducherry',
+	},
+	{
+		country_short: 'AU',
+		region: 'New South Wales',
+		city: 'Sydney',
+	},
+	{
+		country_short: 'AU',
+		region: 'Australian Capital Territory',
+		city: 'Canberra',
+	},
+	{
+		country_short: 'AU',
+		region: 'Northern Territory',
+		city: 'Titjikala',
+	},
+	{
+		country_short: 'TH',
+		region: 'Chaiyaphum',
+		city: 'Chatturat',
+	},
+	{
+		country_short: 'CN',
+		region: 'Guizhou',
+		city: 'Anshun',
+	},
+	{
+		country_short: 'CN',
+		region: 'Ningxia Huizu',
+		city: 'Yinchuan',
+	},
+	{
+		country_short: 'CN',
+		region: 'Jiangsu',
+		city: 'Nanjing',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ha Noi',
+		city: 'Hanoi',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ho Chi Minh',
+		city: 'Ho Chi Minh City',
+	},
+	{
+		country_short: 'VN',
+		region: 'Hai Duong',
+		city: 'Hai Duong',
+	},
+	{
+		country_short: 'VN',
+		region: 'Dong Nai',
+		city: 'Bien Hoa',
+	},
+	{
+		country_short: 'VN',
+		region: 'Da Nang',
+		city: 'Da Nang',
+	},
+	{
+		country_short: 'VN',
+		region: 'Phu Yen',
+		city: 'Tuy Hoa',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ca Mau',
+		city: 'Ca Mau',
+	},
+	{
+		country_short: 'VN',
+		region: 'Binh Duong',
+		city: 'Thu Dau Mot',
+	},
+	{
+		country_short: 'VN',
+		region: 'Khanh Hoa',
+		city: 'Nha Trang',
+	},
+	{
+		country_short: 'VN',
+		region: 'Dak Lak',
+		city: 'Buon Ma Thuot',
+	},
+	{
+		country_short: 'VN',
+		region: 'Quang Ninh',
+		city: 'Ha Long',
+	},
+	{
+		country_short: 'VN',
+		region: 'Bac Giang',
+		city: 'Thang',
+	},
+	{
+		country_short: 'VN',
+		region: 'Tay Ninh',
+		city: 'Phu Khuong',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ba Ria - Vung Tau',
+		city: 'Phuoc Lap',
+	},
+	{
+		country_short: 'VN',
+		region: 'Thua Thien-Hue',
+		city: 'Hue',
+	},
+	{
+		country_short: 'VN',
+		region: 'Quang Ngai',
+		city: 'Quang Ngai',
+	},
+	{
+		country_short: 'VN',
+		region: 'Binh Thuan',
+		city: 'Phan Thiet',
+	},
+	{
+		country_short: 'VN',
+		region: 'An Giang',
+		city: 'Long Xuyen',
+	},
+	{
+		country_short: 'VN',
+		region: 'Long An',
+		city: 'Tan An',
+	},
+	{
+		country_short: 'VN',
+		region: 'Can Tho',
+		city: 'Can Tho',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ben Tre',
+		city: 'Ben Tre',
+	},
+	{
+		country_short: 'VN',
+		region: 'Bac Ninh',
+		city: 'Bac Ninh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Lam Dong',
+		city: 'Da Lat',
+	},
+	{
+		country_short: 'VN',
+		region: 'Kon Tum',
+		city: 'Kon Tum',
+	},
+	{
+		country_short: 'VN',
+		region: 'Thai Nguyen',
+		city: 'Thai Nguyen',
+	},
+	{
+		country_short: 'VN',
+		region: 'Hung Yen',
+		city: 'Hung Yen',
+	},
+	{
+		country_short: 'VN',
+		region: 'Thanh Hoa',
+		city: 'Thanh Hoa',
+	},
+	{
+		country_short: 'VN',
+		region: 'Yen Bai',
+		city: 'Yen Bai',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ninh Thuan',
+		city: 'Phan Rang-Thap Cham',
+	},
+	{
+		country_short: 'VN',
+		region: 'Gia Lai',
+		city: 'Pleiku',
+	},
+	{
+		country_short: 'VN',
+		region: 'Lang Son',
+		city: 'Lang Son',
+	},
+	{
+		country_short: 'VN',
+		region: 'Kien Giang',
+		city: 'Rach Gia',
+	},
+	{
+		country_short: 'VN',
+		region: 'Binh Dinh',
+		city: 'Qui Nhon',
+	},
+	{
+		country_short: 'VN',
+		region: 'Hai Phong',
+		city: 'Haiphong',
+	},
+	{
+		country_short: 'VN',
+		region: 'Soc Trang',
+		city: 'Soc Trang',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ninh Binh',
+		city: 'Ninh Binh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Thai Binh',
+		city: 'Thai Binh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Dien Bien',
+		city: 'Dien Bien Phu',
+	},
+	{
+		country_short: 'VN',
+		region: 'Quang Binh',
+		city: 'Dong Hoi',
+	},
+	{
+		country_short: 'VN',
+		region: 'Quang Nam',
+		city: 'Hoi An',
+	},
+	{
+		country_short: 'VN',
+		region: 'Nghe An',
+		city: 'Vinh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Tra Vinh',
+		city: 'Tra Vinh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Tien Giang',
+		city: 'My Tho',
+	},
+	{
+		country_short: 'VN',
+		region: 'Vinh Phuc',
+		city: 'Vinh Yen',
+	},
+	{
+		country_short: 'VN',
+		region: 'Vinh Long',
+		city: 'Vinh Long',
+	},
+	{
+		country_short: 'VN',
+		region: 'Phu Tho',
+		city: 'Viet Tri',
+	},
+	{
+		country_short: 'VN',
+		region: 'Tuyen Quang',
+		city: 'Tuyen Quang',
+	},
+	{
+		country_short: 'VN',
+		region: 'Dong Thap',
+		city: 'Cao Lanh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Cao Bang',
+		city: 'Cao Bang',
+	},
+	{
+		country_short: 'VN',
+		region: 'Nam Dinh',
+		city: 'Nam Dinh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Lao Cai',
+		city: 'Lao Cai',
+	},
+	{
+		country_short: 'CN',
+		region: 'Heilongjiang',
+		city: 'Hegang',
+	},
+	{
+		country_short: 'JP',
+		region: 'Oita',
+		city: 'Oita',
+	},
+	{
+		country_short: 'JP',
+		region: 'Kagawa',
+		city: 'Takamatsu',
+	},
+	{
+		country_short: 'CN',
+		region: 'Shanxi',
+		city: 'Taiyuan',
+	},
+	{
+		country_short: 'JP',
+		region: 'Shiga',
+		city: 'Otsu',
+	},
+	{
+		country_short: 'CN',
+		region: 'Shaanxi',
+		city: "Xi'an",
+	},
+	{
+		country_short: 'CN',
+		region: 'Zhejiang',
+		city: 'Hangzhou',
+	},
+	{
+		country_short: 'KR',
+		region: 'Busan-gwangyeoksi',
+		city: 'Busan',
+	},
+	{
+		country_short: 'CN',
+		region: 'Jiangxi',
+		city: 'Jingdong',
+	},
+	{
+		country_short: 'AU',
+		region: 'South Australia',
+		city: 'Adelaide',
+	},
+	{
+		country_short: 'AU',
+		region: 'Western Australia',
+		city: 'Perth',
+	},
+	{
+		country_short: 'TW',
+		region: 'Tainan',
+		city: 'Tainan',
+	},
+	{
+		country_short: 'TW',
+		region: 'Yilan',
+		city: 'Yilan',
+	},
+	{
+		country_short: 'TW',
+		region: 'Hualien',
+		city: 'Hualien',
+	},
+	{
+		country_short: 'TW',
+		region: 'Changhua',
+		city: 'Changhua',
+	},
+	{
+		country_short: 'TW',
+		region: 'Taitung',
+		city: 'Taitung',
+	},
+	{
+		country_short: 'TW',
+		region: 'Yunlin',
+		city: 'Douliu',
+	},
+	{
+		country_short: 'TW',
+		region: 'Chiayi',
+		city: 'Puzi',
+	},
+	{
+		country_short: 'TW',
+		region: 'Nantou',
+		city: 'Puli',
+	},
+	{
+		country_short: 'TW',
+		region: 'Miaoli',
+		city: 'Miaoli',
+	},
+	{
+		country_short: 'TW',
+		region: 'Kaohsiung',
+		city: 'Kaohsiung',
+	},
+	{
+		country_short: 'TW',
+		region: 'Penghu',
+		city: 'Magong',
+	},
+	{
+		country_short: 'TW',
+		region: 'Pingtung',
+		city: 'Hengchun',
+	},
+	{
+		country_short: 'TW',
+		region: 'Kinmen',
+		city: 'Jincheng',
+	},
+	{
+		country_short: 'NO',
+		region: 'Vestfold og Telemark',
+		city: 'Porsgrunn',
+	},
+	{
+		country_short: 'KR',
+		region: 'Gyeongsangnam-do',
+		city: 'Changwon',
+	},
+	{
+		country_short: 'KR',
+		region: 'Gyeongsangbuk-do',
+		city: 'Andong',
+	},
+	{
+		country_short: 'BR',
+		region: 'Bahia',
+		city: 'Central',
+	},
+	{
+		country_short: 'AR',
+		region: 'Ciudad Autonoma de Buenos Aires',
+		city: 'Buenos Aires',
+	},
+	{
+		country_short: 'PS',
+		region: ' State of"',
+		city: 'Nablus',
+	},
+	{
+		country_short: 'ES',
+		region: 'Madrid, Comunidad de',
+		city: 'Madrid, Comunidad de',
+	},
+	{
+		country_short: 'FR',
+		region: 'Ile-de-France',
+		city: 'Paris',
+	},
+	{
+		country_short: 'IN',
+		region: 'Punjab',
+		city: 'Jandiala Guru',
+	},
+	{
+		country_short: 'IN',
+		region: 'Uttarakhand',
+		city: 'Haridwar',
+	},
+	{
+		country_short: 'IN',
+		region: 'Jammu and Kashmir',
+		city: 'Udhampur',
+	},
+	{
+		country_short: 'IN',
+		region: 'Himachal Pradesh',
+		city: 'Sarka Ghat',
+	},
+	{
+		country_short: 'IN',
+		region: 'Meghalaya',
+		city: 'Shillong',
+	},
+	{
+		country_short: 'KR',
+		region: 'Daejeon-gwangyeoksi',
+		city: 'Daejeon',
+	},
+	{
+		country_short: 'KR',
+		region: 'Gangwon-do',
+		city: 'Yeongwol',
+	},
+	{
+		country_short: 'KR',
+		region: 'Ulsan-gwangyeoksi',
+		city: 'Ulsan',
+	},
+	{
+		country_short: 'KR',
+		region: 'Chungcheongbuk-do',
+		city: 'Cheongju',
+	},
+	{
+		country_short: 'KR',
+		region: 'Daegu-gwangyeoksi',
+		city: 'Daegu',
+	},
+	{
+		country_short: 'KR',
+		region: 'Jeollabuk-do',
+		city: 'Gunsan',
+	},
+	{
+		country_short: 'KR',
+		region: 'Jeju-teukbyeoljachido',
+		city: 'Jeju',
+	},
+	{
+		country_short: 'FR',
+		region: 'Pays-de-la-Loire',
+		city: 'Parcay-les-Pins',
+	},
+	{
+		country_short: 'FR',
+		region: 'Centre-Val de Loire',
+		city: 'Saint-Aignan',
+	},
+	{
+		country_short: 'FR',
+		region: 'Normandie',
+		city: 'Le Teilleul',
+	},
+	{
+		country_short: 'FR',
+		region: "Provence-Alpes-Cote-d'Azur",
+		city: 'Nice',
+	},
+	{
+		country_short: 'FR',
+		region: 'Auvergne-Rhone-Alpes',
+		city: 'Auzat-la-Combelle',
+	},
+	{
+		country_short: 'FR',
+		region: 'Occitanie',
+		city: "Saint-Chely-d'Apcher",
+	},
+	{
+		country_short: 'FR',
+		region: 'Hauts-de-France',
+		city: 'Lille',
+	},
+	{
+		country_short: 'FR',
+		region: 'Grand-Est',
+		city: 'Givet',
+	},
+	{
+		country_short: 'FR',
+		region: 'Nouvelle-Aquitaine',
+		city: 'Port-Sainte-Marie',
+	},
+	{
+		country_short: 'FR',
+		region: 'Bourgogne-Franche-Comte',
+		city: 'Lormes',
+	},
+	{
+		country_short: 'FR',
+		region: 'Corse',
+		city: 'Aleria',
+	},
+	{
+		country_short: 'FR',
+		region: 'Bretagne',
+		city: 'Plumergat',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Praha, Hlavni mesto',
+		city: 'Praha, Hlavni mesto',
+	},
+	{
+		country_short: 'DE',
+		region: 'Hessen',
+		city: 'Frankfurt am Main',
+	},
+	{
+		country_short: 'AT',
+		region: 'Wien',
+		city: 'Vienna',
+	},
+	{
+		country_short: 'CH',
+		region: 'Zurich',
+		city: 'Glattbrugg',
+	},
+	{
+		country_short: 'GB',
+		region: 'England',
+		city: 'London',
+	},
+	{
+		country_short: 'BR',
+		region: 'Distrito Federal',
+		city: 'Brasilia',
+	},
+	{
+		country_short: 'IT',
+		region: 'Lazio',
+		city: 'Rome',
+	},
+	{
+		country_short: 'NL',
+		region: 'Noord-Holland',
+		city: 'Amsterdam',
+	},
+	{
+		country_short: 'GR',
+		region: 'Attiki',
+		city: 'Athens',
+	},
+	{
+		country_short: 'RU',
+		region: "Nizhegorodskaya oblast'",
+		city: 'Nizhniy Novgorod',
+	},
+	{
+		country_short: 'RU',
+		region: 'Sankt-Peterburg',
+		city: 'Saint Petersburg',
+	},
+	{
+		country_short: 'IT',
+		region: 'Lombardia',
+		city: 'Milan',
+	},
+	{
+		country_short: 'US',
+		region: 'Virginia',
+		city: 'Ashburn',
+	},
+	{
+		country_short: 'DE',
+		region: 'Hamburg',
+		city: 'Hamburg',
+	},
+	{
+		country_short: 'US',
+		region: 'Florida',
+		city: 'Miami',
+	},
+	{
+		country_short: 'DE',
+		region: 'Bayern',
+		city: 'Munich',
+	},
+	{
+		country_short: 'BE',
+		region: 'Brussels Hoofdstedelijk Gewest',
+		city: 'Brussels',
+	},
+	{
+		country_short: 'RU',
+		region: 'Moskva',
+		city: 'Moscow',
+	},
+	{
+		country_short: 'DE',
+		region: 'Nordrhein-Westfalen',
+		city: 'Dusseldorf',
+	},
+	{
+		country_short: 'DK',
+		region: 'Hovedstaden',
+		city: 'Ballerup',
+	},
+	{
+		country_short: 'PT',
+		region: 'Lisboa',
+		city: 'Lisbon',
+	},
+	{
+		country_short: 'SE',
+		region: 'Stockholms lan',
+		city: 'Stockholm',
+	},
+	{
+		country_short: 'IT',
+		region: 'Sicilia',
+		city: 'Palermo',
+	},
+	{
+		country_short: 'GH',
+		region: 'Greater Accra',
+		city: 'Accra',
+	},
+	{
+		country_short: 'IE',
+		region: 'Dublin',
+		city: 'Dublin',
+	},
+	{
+		country_short: 'DE',
+		region: 'Rheinland-Pfalz',
+		city: 'Isenburg',
+	},
+	{
+		country_short: 'BR',
+		region: 'Rio de Janeiro',
+		city: 'Rio de Janeiro',
+	},
+	{
+		country_short: 'US',
+		region: 'New York',
+		city: 'New York City',
+	},
+	{
+		country_short: 'CM',
+		region: 'Centre',
+		city: 'Yaounde',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Gauteng',
+		city: 'Johannesburg',
+	},
+	{
+		country_short: 'TR',
+		region: 'Istanbul',
+		city: 'Istanbul',
+	},
+	{
+		country_short: 'AE',
+		region: 'Al Fujayrah',
+		city: 'Al Fujayrah',
+	},
+	{
+		country_short: 'PL',
+		region: 'Mazowieckie',
+		city: 'Warsaw',
+	},
+	{
+		country_short: 'BR',
+		region: 'Sao Paulo',
+		city: 'Sao Paulo',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Western Cape',
+		city: 'Cape Town',
+	},
+	{
+		country_short: 'BR',
+		region: 'Parana',
+		city: 'Curitiba',
+	},
+	{
+		country_short: 'NO',
+		region: 'Oslo',
+		city: 'Oslo',
+	},
+	{
+		country_short: 'JO',
+		region: "Al 'Asimah",
+		city: 'Amman',
+	},
+	{
+		country_short: 'RO',
+		region: 'Bucuresti',
+		city: 'Bucharest',
+	},
+	{
+		country_short: 'RU',
+		region: 'Krasnodarskiy kray',
+		city: 'Krasnodar',
+	},
+	{
+		country_short: 'RU',
+		region: "Novosibirskaya oblast'",
+		city: 'Kochenevo',
+	},
+	{
+		country_short: 'RU',
+		region: "Sverdlovskaya oblast'",
+		city: 'Yekaterinburg',
+	},
+	{
+		country_short: 'KE',
+		region: 'Mombasa',
+		city: 'Mombasa',
+	},
+	{
+		country_short: 'TR',
+		region: 'Ankara',
+		city: 'Ankara',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kampala',
+		city: 'Kampala',
+	},
+	{
+		country_short: 'AM',
+		region: 'Erevan',
+		city: 'Yerevan',
+	},
+	{
+		country_short: 'TZ',
+		region: ' United Republic of"',
+		city: 'Dar es Salaam',
+	},
+	{
+		country_short: 'US',
+		region: 'Illinois',
+		city: 'Chicago',
+	},
+	{
+		country_short: 'BI',
+		region: 'Bujumbura Mairie',
+		city: 'Bujumbura',
+	},
+	{
+		country_short: 'IE',
+		region: 'Cork',
+		city: 'Cork',
+	},
+	{
+		country_short: 'US',
+		region: 'Texas',
+		city: 'Dallas',
+	},
+	{
+		country_short: 'UY',
+		region: 'Montevideo',
+		city: 'Montevideo',
+	},
+	{
+		country_short: 'CL',
+		region: 'Maule',
+		city: 'Constitucion',
+	},
+	{
+		country_short: 'CL',
+		region: 'Region Metropolitana de Santiago',
+		city: 'Santiago',
+	},
+	{
+		country_short: 'LU',
+		region: 'Esch-sur-Alzette',
+		city: 'Bettembourg',
+	},
+	{
+		country_short: 'US',
+		region: 'Washington',
+		city: 'Seattle',
+	},
+	{
+		country_short: 'DE',
+		region: 'Berlin',
+		city: 'Berlin',
+	},
+	{
+		country_short: 'FI',
+		region: 'Uusimaa',
+		city: 'Espoo',
+	},
+	{
+		country_short: 'BG',
+		region: 'Sofia (stolitsa)',
+		city: 'Sofia',
+	},
+	{
+		country_short: 'BR',
+		region: 'Piaui',
+		city: 'Parnaiba',
+	},
+	{
+		country_short: 'DE',
+		region: 'Baden-Wurttemberg',
+		city: 'Bempflingen',
+	},
+	{
+		country_short: 'DK',
+		region: 'Midtjylland',
+		city: 'Arhus',
+	},
+	{
+		country_short: 'UA',
+		region: 'Kyiv',
+		city: 'Kiev',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Iskandariyah',
+		city: 'Alexandria',
+	},
+	{
+		country_short: 'SE',
+		region: 'Uppsala lan',
+		city: 'Uppsala',
+	},
+	{
+		country_short: 'CA',
+		region: 'British Columbia',
+		city: 'Vancouver',
+	},
+	{
+		country_short: 'BR',
+		region: 'Rio Grande do Sul',
+		city: 'Porto Alegre',
+	},
+	{
+		country_short: 'IL',
+		region: 'HaMerkaz',
+		city: 'Kafr Qasim',
+	},
+	{
+		country_short: 'RU',
+		region: 'Bashkortostan, Respublika',
+		city: 'Bashkortostan, Respublika',
+	},
+	{
+		country_short: 'QA',
+		region: 'Ad Dawhah',
+		city: 'Doha',
+	},
+	{
+		country_short: 'GB',
+		region: 'Wales',
+		city: 'Newport',
+	},
+	{
+		country_short: 'GB',
+		region: 'Scotland',
+		city: 'Hamilton',
+	},
+	{
+		country_short: 'GB',
+		region: 'Northern Ireland',
+		city: 'Omagh',
+	},
+	{
+		country_short: 'IT',
+		region: 'Piemonte',
+		city: 'Ivrea',
+	},
+	{
+		country_short: 'IT',
+		region: 'Veneto',
+		city: 'Venice',
+	},
+	{
+		country_short: 'IT',
+		region: 'Liguria',
+		city: 'Genova',
+	},
+	{
+		country_short: 'IT',
+		region: 'Campania',
+		city: 'Naples',
+	},
+	{
+		country_short: 'IT',
+		region: 'Emilia-Romagna',
+		city: 'Modena',
+	},
+	{
+		country_short: 'IT',
+		region: 'Puglia',
+		city: 'Canosa di Puglia',
+	},
+	{
+		country_short: 'IT',
+		region: 'Toscana',
+		city: 'Florence',
+	},
+	{
+		country_short: 'IT',
+		region: "Valle d'Aosta",
+		city: 'Courmayeur',
+	},
+	{
+		country_short: 'IT',
+		region: 'Friuli-Venezia Giulia',
+		city: 'Pordenone',
+	},
+	{
+		country_short: 'IT',
+		region: 'Umbria',
+		city: 'Perugia',
+	},
+	{
+		country_short: 'IT',
+		region: 'Trentino-Alto Adige',
+		city: 'Borgo',
+	},
+	{
+		country_short: 'IT',
+		region: 'Marche',
+		city: 'Tolentino',
+	},
+	{
+		country_short: 'IT',
+		region: 'Sardegna',
+		city: 'Sassari',
+	},
+	{
+		country_short: 'IT',
+		region: 'Abruzzo',
+		city: 'San Salvo',
+	},
+	{
+		country_short: 'IT',
+		region: 'Calabria',
+		city: 'Amantea',
+	},
+	{
+		country_short: 'IT',
+		region: 'Molise',
+		city: 'Termoli',
+	},
+	{
+		country_short: 'IT',
+		region: 'Basilicata',
+		city: 'Matera',
+	},
+	{
+		country_short: 'AE',
+		region: 'Dubayy',
+		city: 'Dubai',
+	},
+	{
+		country_short: 'AE',
+		region: 'Abu Zaby',
+		city: 'Abu Dhabi',
+	},
+	{
+		country_short: 'AE',
+		region: 'Ash Shariqah',
+		city: 'Sharjah',
+	},
+	{
+		country_short: 'AE',
+		region: "Ra's al Khaymah",
+		city: 'Ras Al Khaimah',
+	},
+	{
+		country_short: 'AE',
+		region: "'Ajman",
+		city: "'Ajman",
+	},
+	{
+		country_short: 'AE',
+		region: 'Umm al Qaywayn',
+		city: 'Umm Al Quwain',
+	},
+	{
+		country_short: 'IL',
+		region: 'Tel Aviv',
+		city: 'Tel Aviv',
+	},
+	{
+		country_short: 'IL',
+		region: 'HaTsafon',
+		city: 'Sulam',
+	},
+	{
+		country_short: 'IL',
+		region: 'HaDarom',
+		city: 'Dimona',
+	},
+	{
+		country_short: 'IL',
+		region: 'Hefa',
+		city: 'Haifa',
+	},
+	{
+		country_short: 'IL',
+		region: 'Yerushalayim',
+		city: 'Jerusalem',
+	},
+	{
+		country_short: 'MD',
+		region: 'Chisinau',
+		city: 'Chisinau',
+	},
+	{
+		country_short: 'TR',
+		region: 'Izmir',
+		city: 'Izmir',
+	},
+	{
+		country_short: 'BE',
+		region: 'Antwerpen',
+		city: 'Dessel',
+	},
+	{
+		country_short: 'SC',
+		region: 'English River',
+		city: 'Victoria',
+	},
+	{
+		country_short: 'US',
+		region: 'West Virginia',
+		city: 'Costa',
+	},
+	{
+		country_short: 'BG',
+		region: 'Blagoevgrad',
+		city: 'Petrich',
+	},
+	{
+		country_short: 'BG',
+		region: 'Shumen',
+		city: 'Shumen',
+	},
+	{
+		country_short: 'SE',
+		region: 'Varmlands lan',
+		city: 'Karlstad',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Baghdad',
+		city: 'Baghdad',
+	},
+	{
+		country_short: 'US',
+		region: 'District of Columbia',
+		city: 'Washington',
+	},
+	{
+		country_short: 'NL',
+		region: 'Zuid-Holland',
+		city: 'Brielle',
+	},
+	{
+		country_short: 'TR',
+		region: 'Bursa',
+		city: 'Bursa',
+	},
+	{
+		country_short: 'ES',
+		region: 'Valenciana, Comunidad',
+		city: 'Valenciana, Comunidad',
+	},
+	{
+		country_short: 'US',
+		region: 'Wyoming',
+		city: 'Cheyenne',
+	},
+	{
+		country_short: 'ES',
+		region: 'Extremadura',
+		city: 'Merida',
+	},
+	{
+		country_short: 'LU',
+		region: 'Luxembourg',
+		city: 'Luxembourg',
+	},
+	{
+		country_short: 'UA',
+		region: 'Kharkivska oblast',
+		city: 'Kharkiv',
+	},
+	{
+		country_short: 'VA',
+		region: 'Vatican City',
+		city: 'Vatican City',
+	},
+	{
+		country_short: 'US',
+		region: 'Ohio',
+		city: 'Poland',
+	},
+	{
+		country_short: 'US',
+		region: 'New Jersey',
+		city: 'Secaucus',
+	},
+	{
+		country_short: 'CH',
+		region: 'Bern',
+		city: 'Bern',
+	},
+	{
+		country_short: 'UA',
+		region: 'Kyivska oblast',
+		city: 'Ukrainka',
+	},
+	{
+		country_short: 'US',
+		region: 'Kentucky',
+		city: 'London',
+	},
+	{
+		country_short: 'LV',
+		region: 'Riga',
+		city: 'Riga',
+	},
+	{
+		country_short: 'US',
+		region: 'Utah',
+		city: 'Salt Lake City',
+	},
+	{
+		country_short: 'AT',
+		region: 'Niederosterreich',
+		city: 'Gostling an der Ybbs',
+	},
+	{
+		country_short: 'AT',
+		region: 'Oberosterreich',
+		city: 'Linz',
+	},
+	{
+		country_short: 'UA',
+		region: 'Ternopilska oblast',
+		city: 'Monastyryska',
+	},
+	{
+		country_short: 'CH',
+		region: 'Zug',
+		city: 'Baar',
+	},
+	{
+		country_short: 'RU',
+		region: "Kirovskaya oblast'",
+		city: "Kazan'",
+	},
+	{
+		country_short: 'NL',
+		region: 'Flevoland',
+		city: 'Dronten',
+	},
+	{
+		country_short: 'NL',
+		region: 'Gelderland',
+		city: 'Horst',
+	},
+	{
+		country_short: 'US',
+		region: 'Maryland',
+		city: 'Baltimore',
+	},
+	{
+		country_short: 'IS',
+		region: 'Hofudborgarsvaedi',
+		city: 'Reykjavik',
+	},
+	{
+		country_short: 'US',
+		region: 'Delaware',
+		city: 'Hockessin',
+	},
+	{
+		country_short: 'ES',
+		region: 'Catalunya',
+		city: 'Palamos',
+	},
+	{
+		country_short: 'RU',
+		region: "Moskovskaya oblast'",
+		city: 'Zhukovskiy',
+	},
+	{
+		country_short: 'BE',
+		region: 'Limburg',
+		city: 'Diepenbeek',
+	},
+	{
+		country_short: 'RU',
+		region: "Kaliningradskaya oblast'",
+		city: 'Kaliningrad',
+	},
+	{
+		country_short: 'NL',
+		region: 'Noord-Brabant',
+		city: 'Valkenswaard',
+	},
+	{
+		country_short: 'NL',
+		region: 'Zeeland',
+		city: 'Vlissingen',
+	},
+	{
+		country_short: 'SK',
+		region: 'Bratislavsky kraj',
+		city: 'Bratislava',
+	},
+	{
+		country_short: 'RU',
+		region: "Voronezhskaya oblast'",
+		city: 'Voronezh',
+	},
+	{
+		country_short: 'NL',
+		region: 'Drenthe',
+		city: 'Meppel',
+	},
+	{
+		country_short: 'US',
+		region: 'North Carolina',
+		city: 'Asheville',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Shyghys Qazaqstan oblysy',
+		city: 'Ognevka',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Zhambyl oblysy',
+		city: 'Zhangatas',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Nur-Sultan',
+		city: 'Nur-Sultan',
+	},
+	{
+		country_short: 'DE',
+		region: 'Schleswig-Holstein',
+		city: 'Norderstedt',
+	},
+	{
+		country_short: 'RO',
+		region: 'Timis',
+		city: 'Timisoara',
+	},
+	{
+		country_short: 'PL',
+		region: 'Lubelskie',
+		city: 'Chelm',
+	},
+	{
+		country_short: 'PL',
+		region: 'Slaskie',
+		city: 'Czestochowa',
+	},
+	{
+		country_short: 'PL',
+		region: 'Malopolskie',
+		city: 'Krakow',
+	},
+	{
+		country_short: 'US',
+		region: 'Idaho',
+		city: 'Boise',
+	},
+	{
+		country_short: 'CA',
+		region: 'Ontario',
+		city: 'Financial District',
+	},
+	{
+		country_short: 'LU',
+		region: 'Grevenmacher',
+		city: 'Junglinster',
+	},
+	{
+		country_short: 'AT',
+		region: 'Karnten',
+		city: 'Klagenfurt am Woerthersee',
+	},
+	{
+		country_short: 'TR',
+		region: 'Antalya',
+		city: 'Antalya',
+	},
+	{
+		country_short: 'ES',
+		region: 'Andalucia',
+		city: 'Olula del Rio',
+	},
+	{
+		country_short: 'UA',
+		region: 'Ivano-Frankivska oblast',
+		city: 'Kalush',
+	},
+	{
+		country_short: 'UA',
+		region: 'Donetska oblast',
+		city: 'Mykolaivka',
+	},
+	{
+		country_short: 'GE',
+		region: 'Tbilisi',
+		city: 'Tbilisi',
+	},
+	{
+		country_short: 'EE',
+		region: 'Harjumaa',
+		city: 'Tallinn',
+	},
+	{
+		country_short: 'ES',
+		region: 'Castilla-La Mancha',
+		city: 'La Solana',
+	},
+	{
+		country_short: 'SE',
+		region: 'Vastra Gotalands lan',
+		city: 'Anderstorp',
+	},
+	{
+		country_short: 'US',
+		region: 'Oregon',
+		city: 'Tualatin',
+	},
+	{
+		country_short: 'SE',
+		region: 'Skane lan',
+		city: 'Malmoe',
+	},
+	{
+		country_short: 'NO',
+		region: 'Nordland',
+		city: 'Stokmarknes',
+	},
+	{
+		country_short: 'NO',
+		region: 'Troms og Finnmark',
+		city: 'Hammerfest',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kahramanmaras',
+		city: 'Kahramanmaras',
+	},
+	{
+		country_short: 'HR',
+		region: 'Grad Zagreb',
+		city: 'Odra',
+	},
+	{
+		country_short: 'HR',
+		region: 'Istarska zupanija',
+		city: 'Umag',
+	},
+	{
+		country_short: 'HR',
+		region: 'Splitsko-dalmatinska zupanija',
+		city: 'Kamen',
+	},
+	{
+		country_short: 'MX',
+		region: 'Ciudad de Mexico',
+		city: 'Mexico City',
+	},
+	{
+		country_short: 'FI',
+		region: 'Pohjanmaa',
+		city: 'Narpes',
+	},
+	{
+		country_short: 'BG',
+		region: 'Sliven',
+		city: 'Kotel',
+	},
+	{
+		country_short: 'RU',
+		region: 'Tatarstan, Respublika',
+		city: 'Tatarstan, Respublika',
+	},
+	{
+		country_short: 'RU',
+		region: "Irkutskaya oblast'",
+		city: 'Bratsk',
+	},
+	{
+		country_short: 'PL',
+		region: 'Zachodniopomorskie',
+		city: 'Szczecin',
+	},
+	{
+		country_short: 'BE',
+		region: 'West-Vlaanderen',
+		city: 'Roeselare',
+	},
+	{
+		country_short: 'ES',
+		region: 'Murcia, Region de',
+		city: 'Murcia, Region de',
+	},
+	{
+		country_short: 'DE',
+		region: 'Sachsen',
+		city: 'Haag',
+	},
+	{
+		country_short: 'HU',
+		region: 'Borsod-Abauj-Zemplen',
+		city: 'Ozd',
+	},
+	{
+		country_short: 'HU',
+		region: 'Szabolcs-Szatmar-Bereg',
+		city: 'Nyiregyhaza',
+	},
+	{
+		country_short: 'ES',
+		region: 'Canarias',
+		city: 'Haria',
+	},
+	{
+		country_short: 'UA',
+		region: 'Zakarpatska oblast',
+		city: 'Svalyava',
+	},
+	{
+		country_short: 'PL',
+		region: 'Swietokrzyskie',
+		city: 'Kostomloty Drugie',
+	},
+	{
+		country_short: 'PL',
+		region: 'Dolnoslaskie',
+		city: 'Bystrzyca Klodzka',
+	},
+	{
+		country_short: 'FI',
+		region: 'Pirkanmaa',
+		city: 'Tampere',
+	},
+	{
+		country_short: 'FI',
+		region: 'Kanta-Hame',
+		city: 'Vantaa',
+	},
+	{
+		country_short: 'FI',
+		region: 'Keski-Suomi',
+		city: 'Laukaa',
+	},
+	{
+		country_short: 'PH',
+		region: 'Albay',
+		city: 'Legaspi',
+	},
+	{
+		country_short: 'NL',
+		region: 'Utrecht',
+		city: 'Utrecht',
+	},
+	{
+		country_short: 'RO',
+		region: 'Valcea',
+		city: 'Valcea',
+	},
+	{
+		country_short: 'PL',
+		region: 'Lodzkie',
+		city: 'Lodz',
+	},
+	{
+		country_short: 'RO',
+		region: 'Arges',
+		city: 'Curtea de Arges',
+	},
+	{
+		country_short: 'RO',
+		region: 'Bihor',
+		city: 'Oradea',
+	},
+	{
+		country_short: 'DE',
+		region: 'Bremen',
+		city: 'Bremen',
+	},
+	{
+		country_short: 'SA',
+		region: 'Ar Riyad',
+		city: 'Riyadh',
+	},
+	{
+		country_short: 'BE',
+		region: 'Oost-Vlaanderen',
+		city: 'Sint-Martens-Latem',
+	},
+	{
+		country_short: 'UA',
+		region: 'Avtonomna Respublika Krym',
+		city: 'Morskoye',
+	},
+	{
+		country_short: 'RU',
+		region: "Stavropol'skiy kray",
+		city: 'Pyatigorsk',
+	},
+	{
+		country_short: 'DE',
+		region: 'Saarland',
+		city: 'Sankt Wendel',
+	},
+	{
+		country_short: 'IE',
+		region: 'Kerry',
+		city: 'Tralee',
+	},
+	{
+		country_short: 'IE',
+		region: 'Limerick',
+		city: 'Abbeyfeale',
+	},
+	{
+		country_short: 'TR',
+		region: 'Gaziantep',
+		city: 'Gaziantep',
+	},
+	{
+		country_short: 'MT',
+		region: 'Birkirkara',
+		city: 'Birkirkara',
+	},
+	{
+		country_short: 'NL',
+		region: 'Limburg',
+		city: 'Beek',
+	},
+	{
+		country_short: 'LT',
+		region: 'Vilniaus apskritis',
+		city: 'Vilnius',
+	},
+	{
+		country_short: 'HU',
+		region: 'Bacs-Kiskun',
+		city: 'Bacsalmas',
+	},
+	{
+		country_short: 'HU',
+		region: 'Nograd',
+		city: 'Retsag',
+	},
+	{
+		country_short: 'SE',
+		region: 'Kronobergs lan',
+		city: 'Vaxjo',
+	},
+	{
+		country_short: 'RU',
+		region: "Novgorodskaya oblast'",
+		city: 'Velikiy Novgorod',
+	},
+	{
+		country_short: 'RU',
+		region: "Tyumenskaya oblast'",
+		city: "Tyumen'",
+	},
+	{
+		country_short: 'RU',
+		region: "Omskaya oblast'",
+		city: "Isil'kul'",
+	},
+	{
+		country_short: 'RU',
+		region: 'Altayskiy kray',
+		city: 'Bayevo',
+	},
+	{
+		country_short: 'RU',
+		region: 'Khakasiya, Respublika',
+		city: 'Khakasiya, Respublika',
+	},
+	{
+		country_short: 'RU',
+		region: 'Krasnoyarskiy kray',
+		city: 'Uzhur',
+	},
+	{
+		country_short: 'RU',
+		region: "Kemerovskaya oblast'",
+		city: 'Novokuznetsk',
+	},
+	{
+		country_short: 'RU',
+		region: "Astrakhanskaya oblast'",
+		city: "Astrakhan'",
+	},
+	{
+		country_short: 'RU',
+		region: "Kaluzhskaya oblast'",
+		city: 'Kaluga',
+	},
+	{
+		country_short: 'RU',
+		region: 'Permskiy kray',
+		city: 'Perm',
+	},
+	{
+		country_short: 'RU',
+		region: 'Mariy El, Respublika',
+		city: 'Mariy El, Respublika',
+	},
+	{
+		country_short: 'RU',
+		region: 'Chuvashskaya Respublika',
+		city: 'Cheboksary',
+	},
+	{
+		country_short: 'RU',
+		region: 'Yamalo-Nenetskiy avtonomnyy okrug',
+		city: 'Noyabrsk',
+	},
+	{
+		country_short: 'RU',
+		region: "Tul'skaya oblast'",
+		city: 'Tula',
+	},
+	{
+		country_short: 'RU',
+		region: 'Primorskiy kray',
+		city: "Ol'ga",
+	},
+	{
+		country_short: 'RU',
+		region: "Penzenskaya oblast'",
+		city: 'Penza',
+	},
+	{
+		country_short: 'RU',
+		region: "Kurganskaya oblast'",
+		city: 'Kurgan',
+	},
+	{
+		country_short: 'RU',
+		region: "Chelyabinskaya oblast'",
+		city: 'Chelyabinsk',
+	},
+	{
+		country_short: 'SE',
+		region: 'Ostergotlands lan',
+		city: 'Norrkoping',
+	},
+	{
+		country_short: 'SE',
+		region: 'Blekinge lan',
+		city: 'Kallinge',
+	},
+	{
+		country_short: 'SE',
+		region: 'Kalmar lan',
+		city: 'Virserum',
+	},
+	{
+		country_short: 'SE',
+		region: 'Dalarnas lan',
+		city: 'Horndal',
+	},
+	{
+		country_short: 'SE',
+		region: 'Hallands lan',
+		city: 'Falkenberg',
+	},
+	{
+		country_short: 'SE',
+		region: 'Vastmanlands lan',
+		city: 'Surahammar',
+	},
+	{
+		country_short: 'SE',
+		region: 'Jonkopings lan',
+		city: 'Habo',
+	},
+	{
+		country_short: 'SE',
+		region: 'Orebro lan',
+		city: 'Orebro',
+	},
+	{
+		country_short: 'SE',
+		region: 'Sodermanlands lan',
+		city: 'Katrineholm',
+	},
+	{
+		country_short: 'SE',
+		region: 'Gavleborgs lan',
+		city: 'Soderhamn',
+	},
+	{
+		country_short: 'SE',
+		region: 'Vasterbottens lan',
+		city: 'Umea',
+	},
+	{
+		country_short: 'SE',
+		region: 'Jamtlands lan',
+		city: 'Ostersund',
+	},
+	{
+		country_short: 'SE',
+		region: 'Gotlands lan',
+		city: 'Visby',
+	},
+	{
+		country_short: 'SE',
+		region: 'Vasternorrlands lan',
+		city: 'Kramfors',
+	},
+	{
+		country_short: 'SE',
+		region: 'Norrbottens lan',
+		city: 'Pitea',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Almaty',
+		city: 'Almaty',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Almaty oblysy',
+		city: 'Alga',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Ongtustik Qazaqstan oblysy',
+		city: 'Aksu',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Shymkent',
+		city: 'Shymkent',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Aqmola oblysy',
+		city: 'Zhaqsy',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Batys Qazaqstan oblysy',
+		city: 'Fedorovka',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Qyzylorda oblysy',
+		city: 'Aral',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Qaraghandy oblysy',
+		city: 'Kazakhstan',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Soltustik Qazaqstan oblysy',
+		city: 'Petropavl',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Qostanay oblysy',
+		city: 'Rudnyy',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Atyrau oblysy',
+		city: 'Atyrau',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Pavlodar oblysy',
+		city: 'Pavlodar',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Aqtobe oblysy',
+		city: 'Shubarshi',
+	},
+	{
+		country_short: 'KZ',
+		region: 'Mangghystau oblysy',
+		city: 'Omirzaq',
+	},
+	{
+		country_short: 'PT',
+		region: 'Guarda',
+		city: 'Pinhel',
+	},
+	{
+		country_short: 'PT',
+		region: 'Viseu',
+		city: 'Viseu',
+	},
+	{
+		country_short: 'PT',
+		region: 'Aveiro',
+		city: 'Espinho',
+	},
+	{
+		country_short: 'PT',
+		region: 'Porto',
+		city: 'Porto',
+	},
+	{
+		country_short: 'PT',
+		region: 'Vila Real',
+		city: 'Chaves',
+	},
+	{
+		country_short: 'PT',
+		region: 'Castelo Branco',
+		city: 'Castelo Branco',
+	},
+	{
+		country_short: 'PT',
+		region: 'Coimbra',
+		city: 'Quinta',
+	},
+	{
+		country_short: 'PT',
+		region: 'Leiria',
+		city: 'Leiria',
+	},
+	{
+		country_short: 'PT',
+		region: 'Portalegre',
+		city: 'Alter do Chao',
+	},
+	{
+		country_short: 'PT',
+		region: 'Braga',
+		city: 'Ribeirao',
+	},
+	{
+		country_short: 'PT',
+		region: 'Santarem',
+		city: 'Monsanto',
+	},
+	{
+		country_short: 'PT',
+		region: 'Viana do Castelo',
+		city: 'Mozelos',
+	},
+	{
+		country_short: 'PT',
+		region: 'Braganca',
+		city: 'Braganca',
+	},
+	{
+		country_short: 'PT',
+		region: 'Faro',
+		city: 'Monte Gordo',
+	},
+	{
+		country_short: 'GR',
+		region: 'Kriti',
+		city: 'Chania',
+	},
+	{
+		country_short: 'GR',
+		region: 'Peloponnisos',
+		city: 'Vytina',
+	},
+	{
+		country_short: 'GR',
+		region: 'Sterea Ellada',
+		city: 'Itea',
+	},
+	{
+		country_short: 'GR',
+		region: 'Voreio Aigaio',
+		city: 'Chios',
+	},
+	{
+		country_short: 'GR',
+		region: 'Notio Aigaio',
+		city: 'Ziparion',
+	},
+	{
+		country_short: 'GR',
+		region: 'Dytiki Ellada',
+		city: 'Mirsini',
+	},
+	{
+		country_short: 'GR',
+		region: 'Thessalia',
+		city: 'Artesianon',
+	},
+	{
+		country_short: 'GR',
+		region: 'Ipeiros',
+		city: 'Kanallakion',
+	},
+	{
+		country_short: 'GR',
+		region: 'Kentriki Makedonia',
+		city: 'Portaria',
+	},
+	{
+		country_short: 'GR',
+		region: 'Anatoliki Makedonia kai Thraki',
+		city: 'Volax',
+	},
+	{
+		country_short: 'GR',
+		region: 'Ionia Nisia',
+		city: 'Kerkyra',
+	},
+	{
+		country_short: 'GR',
+		region: 'Dytiki Makedonia',
+		city: 'Grevena',
+	},
+	{
+		country_short: 'SA',
+		region: 'Makkah al Mukarramah',
+		city: "Ta'if",
+	},
+	{
+		country_short: 'SA',
+		region: "Ha'il",
+		city: "Ha'il",
+	},
+	{
+		country_short: 'SA',
+		region: 'Al Qasim',
+		city: 'Al Bukayriyah',
+	},
+	{
+		country_short: 'SA',
+		region: 'Ash Sharqiyah',
+		city: 'Dhahran',
+	},
+	{
+		country_short: 'SA',
+		region: 'Al Madinah al Munawwarah',
+		city: 'Medina',
+	},
+	{
+		country_short: 'SA',
+		region: 'Al Jawf',
+		city: 'Sakaka',
+	},
+	{
+		country_short: 'SA',
+		region: "'Asir",
+		city: 'Tanumah',
+	},
+	{
+		country_short: 'SA',
+		region: 'Tabuk',
+		city: 'Tabuk',
+	},
+	{
+		country_short: 'SA',
+		region: 'Al Hudud ash Shamaliyah',
+		city: 'Turayf',
+	},
+	{
+		country_short: 'RU',
+		region: "Ivanovskaya oblast'",
+		city: 'Ivanovo',
+	},
+	{
+		country_short: 'RU',
+		region: "Volgogradskaya oblast'",
+		city: 'Volgograd',
+	},
+	{
+		country_short: 'RU',
+		region: "Vologodskaya oblast'",
+		city: 'Vologda',
+	},
+	{
+		country_short: 'RU',
+		region: "Samarskaya oblast'",
+		city: 'Tolyatti',
+	},
+	{
+		country_short: 'RU',
+		region: "Ul'yanovskaya oblast'",
+		city: 'Ulyanovsk',
+	},
+	{
+		country_short: 'RU',
+		region: 'Adygeya, Respublika',
+		city: 'Adygeya, Respublika',
+	},
+	{
+		country_short: 'RU',
+		region: "Rostovskaya oblast'",
+		city: 'Rostov-na-Donu',
+	},
+	{
+		country_short: 'RU',
+		region: "Saratovskaya oblast'",
+		city: 'Sokolovyy',
+	},
+	{
+		country_short: 'RU',
+		region: "Arkhangel'skaya oblast'",
+		city: "Arkhangel'sk",
+	},
+	{
+		country_short: 'RU',
+		region: 'Khabarovskiy kray',
+		city: 'Khabarovsk',
+	},
+	{
+		country_short: 'RU',
+		region: "Bryanskaya oblast'",
+		city: 'Bryansk',
+	},
+	{
+		country_short: 'RU',
+		region: "Smolenskaya oblast'",
+		city: 'Smolensk',
+	},
+	{
+		country_short: 'RU',
+		region: "Yaroslavskaya oblast'",
+		city: "Yaroslavl'",
+	},
+	{
+		country_short: 'RU',
+		region: "Orlovskaya oblast'",
+		city: 'Orel',
+	},
+	{
+		country_short: 'RU',
+		region: "Kurskaya oblast'",
+		city: 'Kurchatov',
+	},
+	{
+		country_short: 'RU',
+		region: "Tverskaya oblast'",
+		city: "Tver'",
+	},
+	{
+		country_short: 'RU',
+		region: "Kostromskaya oblast'",
+		city: 'Kostroma',
+	},
+	{
+		country_short: 'RU',
+		region: "Lipetskaya oblast'",
+		city: 'Lipetsk',
+	},
+	{
+		country_short: 'RU',
+		region: "Leningradskaya oblast'",
+		city: 'Priladozhskiy',
+	},
+	{
+		country_short: 'DK',
+		region: 'Sjaelland',
+		city: 'Korsor',
+	},
+	{
+		country_short: 'DK',
+		region: 'Syddanmark',
+		city: 'Oksbol',
+	},
+	{
+		country_short: 'DK',
+		region: 'Nordjylland',
+		city: 'Frederikshavn',
+	},
+	{
+		country_short: 'CY',
+		region: 'Lefkosia',
+		city: 'Nicosia',
+	},
+	{
+		country_short: 'ES',
+		region: 'Navarra, Comunidad Foral de',
+		city: 'Navarra, Comunidad Foral de',
+	},
+	{
+		country_short: 'ES',
+		region: 'Pais Vasco',
+		city: 'San Sebastian',
+	},
+	{
+		country_short: 'ES',
+		region: 'Galicia',
+		city: 'Lugo',
+	},
+	{
+		country_short: 'ES',
+		region: 'Castilla y Leon',
+		city: 'Burgos',
+	},
+	{
+		country_short: 'ES',
+		region: 'Illes Balears',
+		city: 'Palma',
+	},
+	{
+		country_short: 'ES',
+		region: 'Aragon',
+		city: 'Daroca',
+	},
+	{
+		country_short: 'ES',
+		region: 'Cantabria',
+		city: 'Reinosa',
+	},
+	{
+		country_short: 'ES',
+		region: 'La Rioja',
+		city: 'Logrono',
+	},
+	{
+		country_short: 'ES',
+		region: 'Melilla',
+		city: 'Melilla',
+	},
+	{
+		country_short: 'ES',
+		region: 'Asturias, Principado de',
+		city: 'Asturias, Principado de',
+	},
+	{
+		country_short: 'ES',
+		region: 'Ceuta',
+		city: 'Ceuta',
+	},
+	{
+		country_short: 'IR',
+		region: 'Tehran',
+		city: 'Tehran',
+	},
+	{
+		country_short: 'IR',
+		region: 'Sistan va Baluchestan',
+		city: 'Zabol',
+	},
+	{
+		country_short: 'IR',
+		region: 'Hamadan',
+		city: 'Hamadan',
+	},
+	{
+		country_short: 'IR',
+		region: 'Fars',
+		city: 'Shiraz',
+	},
+	{
+		country_short: 'IR',
+		region: 'Khorasan-e Razavi',
+		city: 'Quchan',
+	},
+	{
+		country_short: 'IR',
+		region: 'Khuzestan',
+		city: 'Ahvaz',
+	},
+	{
+		country_short: 'IR',
+		region: 'Alborz',
+		city: 'Karaj',
+	},
+	{
+		country_short: 'IR',
+		region: 'Azarbayjan-e Sharqi',
+		city: 'Tabriz',
+	},
+	{
+		country_short: 'IR',
+		region: 'Mazandaran',
+		city: 'Tonekabon',
+	},
+	{
+		country_short: 'IR',
+		region: 'Qazvin',
+		city: 'Kaman',
+	},
+	{
+		country_short: 'IR',
+		region: 'Markazi',
+		city: 'Abyek',
+	},
+	{
+		country_short: 'NO',
+		region: 'Viken',
+		city: 'Vikersund',
+	},
+	{
+		country_short: 'NO',
+		region: 'Vestland',
+		city: 'Hylkje',
+	},
+	{
+		country_short: 'NO',
+		region: 'Trondelag',
+		city: 'Mebonden',
+	},
+	{
+		country_short: 'NO',
+		region: 'Innlandet',
+		city: 'Loten',
+	},
+	{
+		country_short: 'NO',
+		region: 'Agder',
+		city: 'Birketveit',
+	},
+	{
+		country_short: 'NO',
+		region: 'Rogaland',
+		city: 'Stavanger',
+	},
+	{
+		country_short: 'NO',
+		region: 'More og Romsdal',
+		city: 'Alesund',
+	},
+	{
+		country_short: 'DE',
+		region: 'Niedersachsen',
+		city: 'Grewenweise',
+	},
+	{
+		country_short: 'DE',
+		region: 'Sachsen-Anhalt',
+		city: 'Halle (Saale)',
+	},
+	{
+		country_short: 'DE',
+		region: 'Mecklenburg-Vorpommern',
+		city: 'Grun Kordshagen',
+	},
+	{
+		country_short: 'DE',
+		region: 'Thuringen',
+		city: 'Gorsbach',
+	},
+	{
+		country_short: 'DE',
+		region: 'Brandenburg',
+		city: 'Bernau bei Berlin',
+	},
+	{
+		country_short: 'IR',
+		region: 'Lorestan',
+		city: 'Khorramabad',
+	},
+	{
+		country_short: 'IR',
+		region: 'Azarbayjan-e Gharbi',
+		city: 'Azad',
+	},
+	{
+		country_short: 'IR',
+		region: 'Qom',
+		city: 'Qom',
+	},
+	{
+		country_short: 'IR',
+		region: 'Hormozgan',
+		city: 'Bandar Abbas',
+	},
+	{
+		country_short: 'IR',
+		region: 'Golestan',
+		city: 'Gorgan',
+	},
+	{
+		country_short: 'IR',
+		region: 'Yazd',
+		city: 'Yazd',
+	},
+	{
+		country_short: 'IR',
+		region: 'Kerman',
+		city: 'Golestan',
+	},
+	{
+		country_short: 'IR',
+		region: 'Khorasan-e Shomali',
+		city: 'Esfarayen',
+	},
+	{
+		country_short: 'IR',
+		region: 'Kordestan',
+		city: 'Khorasan',
+	},
+	{
+		country_short: 'IR',
+		region: 'Semnan',
+		city: 'Semnan',
+	},
+	{
+		country_short: 'IR',
+		region: 'Khorasan-e Jonubi',
+		city: 'Birjand',
+	},
+	{
+		country_short: 'IR',
+		region: 'Esfahan',
+		city: 'Sistan',
+	},
+	{
+		country_short: 'IR',
+		region: 'Gilan',
+		city: 'Astaneh-ye Ashrafiyeh',
+	},
+	{
+		country_short: 'IR',
+		region: 'Zanjan',
+		city: 'Aras',
+	},
+	{
+		country_short: 'IR',
+		region: 'Kermanshah',
+		city: 'Kermanshah',
+	},
+	{
+		country_short: 'IR',
+		region: 'Ilam',
+		city: 'Ilam',
+	},
+	{
+		country_short: 'IR',
+		region: 'Chahar Mahal va Bakhtiari',
+		city: 'Borujen',
+	},
+	{
+		country_short: 'IR',
+		region: 'Bushehr',
+		city: 'Sena',
+	},
+	{
+		country_short: 'IR',
+		region: 'Ardabil',
+		city: 'Parsabad',
+	},
+	{
+		country_short: 'IR',
+		region: 'Kohgiluyeh va Bowyer Ahmad',
+		city: 'Dehdasht',
+	},
+	{
+		country_short: 'US',
+		region: 'Montana',
+		city: 'Havre',
+	},
+	{
+		country_short: 'HU',
+		region: 'Budapest',
+		city: 'Budapest',
+	},
+	{
+		country_short: 'US',
+		region: 'Georgia',
+		city: 'Atlanta',
+	},
+	{
+		country_short: 'US',
+		region: 'Missouri',
+		city: 'Kansas City',
+	},
+	{
+		country_short: 'US',
+		region: 'Massachusetts',
+		city: 'Boston',
+	},
+	{
+		country_short: 'CA',
+		region: 'Quebec',
+		city: 'Montreal',
+	},
+	{
+		country_short: 'US',
+		region: 'Nebraska',
+		city: 'Omaha',
+	},
+	{
+		country_short: 'US',
+		region: 'Tennessee',
+		city: 'Nashville',
+	},
+	{
+		country_short: 'US',
+		region: 'Pennsylvania',
+		city: 'Pittsburgh',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sulawesi Utara',
+		city: 'Manado',
+	},
+	{
+		country_short: 'LT',
+		region: 'Kauno apskritis',
+		city: 'Kaunas',
+	},
+	{
+		country_short: 'US',
+		region: 'Michigan',
+		city: 'Detroit',
+	},
+	{
+		country_short: 'US',
+		region: 'Colorado',
+		city: 'Denver',
+	},
+	{
+		country_short: 'RS',
+		region: 'Beograd',
+		city: 'Belgrade',
+	},
+	{
+		country_short: 'MX',
+		region: 'Queretaro',
+		city: 'Queretaro',
+	},
+	{
+		country_short: 'PL',
+		region: 'Wielkopolskie',
+		city: 'Poznan',
+	},
+	{
+		country_short: 'US',
+		region: 'Arizona',
+		city: 'Phoenix',
+	},
+	{
+		country_short: 'BH',
+		region: "Al 'Asimah",
+		city: 'Manama',
+	},
+	{
+		country_short: 'ID',
+		region: 'Jakarta Raya',
+		city: 'Jakarta',
+	},
+	{
+		country_short: 'CA',
+		region: 'Alberta',
+		city: 'Calgary',
+	},
+	{
+		country_short: 'US',
+		region: 'Indiana',
+		city: 'Indianapolis',
+	},
+	{
+		country_short: 'US',
+		region: 'Mississippi',
+		city: 'Jackson',
+	},
+	{
+		country_short: 'US',
+		region: 'Louisiana',
+		city: 'Monroe',
+	},
+	{
+		country_short: 'US',
+		region: 'Minnesota',
+		city: 'Minneapolis',
+	},
+	{
+		country_short: 'US',
+		region: 'Connecticut',
+		city: 'Hartford',
+	},
+	{
+		country_short: 'US',
+		region: 'Hawaii',
+		city: 'Honolulu',
+	},
+	{
+		country_short: 'VU',
+		region: 'Tafea',
+		city: 'Isangel',
+	},
+	{
+		country_short: 'US',
+		region: 'Oklahoma',
+		city: 'Tulsa',
+	},
+	{
+		country_short: 'US',
+		region: 'Wisconsin',
+		city: 'Milwaukee',
+	},
+	{
+		country_short: 'US',
+		region: 'Nevada',
+		city: 'Las Vegas',
+	},
+	{
+		country_short: 'US',
+		region: 'New Mexico',
+		city: 'Albuquerque',
+	},
+	{
+		country_short: 'US',
+		region: 'Iowa',
+		city: 'Leighton',
+	},
+	{
+		country_short: 'US',
+		region: 'New Hampshire',
+		city: 'Lebanon',
+	},
+	{
+		country_short: 'US',
+		region: 'Rhode Island',
+		city: 'Providence',
+	},
+	{
+		country_short: 'US',
+		region: 'Kansas',
+		city: 'Wichita',
+	},
+	{
+		country_short: 'US',
+		region: 'Arkansas',
+		city: 'Little Rock',
+	},
+	{
+		country_short: 'US',
+		region: 'South Carolina',
+		city: 'Easley',
+	},
+	{
+		country_short: 'US',
+		region: 'Alabama',
+		city: 'Birmingham',
+	},
+	{
+		country_short: 'CA',
+		region: 'Saskatchewan',
+		city: 'Saskatoon',
+	},
+	{
+		country_short: 'PE',
+		region: 'Lima',
+		city: 'Lima',
+	},
+	{
+		country_short: 'US',
+		region: 'Vermont',
+		city: 'Burlington',
+	},
+	{
+		country_short: 'CA',
+		region: 'Nova Scotia',
+		city: 'Bedford',
+	},
+	{
+		country_short: 'MX',
+		region: 'Nuevo Leon',
+		city: 'Monterrey',
+	},
+	{
+		country_short: 'US',
+		region: 'South Dakota',
+		city: 'Rapid City',
+	},
+	{
+		country_short: 'CA',
+		region: 'New Brunswick',
+		city: 'Saint John',
+	},
+	{
+		country_short: 'UY',
+		region: 'Salto',
+		city: 'Salto',
+	},
+	{
+		country_short: 'US',
+		region: 'Maine',
+		city: 'Rumford',
+	},
+	{
+		country_short: 'US',
+		region: 'Alaska',
+		city: 'Anchorage',
+	},
+	{
+		country_short: 'CA',
+		region: 'Prince Edward Island',
+		city: 'Charlottetown',
+	},
+	{
+		country_short: 'CO',
+		region: 'Distrito Capital de Bogota',
+		city: 'Bogota',
+	},
+	{
+		country_short: 'BM',
+		region: 'Hamilton',
+		city: 'Hamilton',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ljubljana',
+		city: 'Ljubljana',
+	},
+	{
+		country_short: 'DJ',
+		region: 'Djibouti',
+		city: 'Djibouti',
+	},
+	{
+		country_short: 'PA',
+		region: 'Panama',
+		city: 'Panama',
+	},
+	{
+		country_short: 'CN',
+		region: 'Xizang',
+		city: 'Gar',
+	},
+	{
+		country_short: 'CH',
+		region: 'Geneve',
+		city: 'Geneva',
+	},
+	{
+		country_short: 'SY',
+		region: 'Rif Dimashq',
+		city: "'Ayn al Fijah",
+	},
+	{
+		country_short: 'SY',
+		region: 'Halab',
+		city: 'Aleppo',
+	},
+	{
+		country_short: 'SY',
+		region: 'Dimashq',
+		city: 'Damascus',
+	},
+	{
+		country_short: 'SY',
+		region: 'Hims',
+		city: 'Homs',
+	},
+	{
+		country_short: 'SY',
+		region: "As Suwayda'",
+		city: 'As Suwayda',
+	},
+	{
+		country_short: 'SY',
+		region: 'Hamah',
+		city: 'Masyaf',
+	},
+	{
+		country_short: 'SY',
+		region: "Dar'a",
+		city: "Dar'a",
+	},
+	{
+		country_short: 'SY',
+		region: 'Al Ladhiqiyah',
+		city: 'Latakia',
+	},
+	{
+		country_short: 'SY',
+		region: 'Tartus',
+		city: 'Hamidiyah',
+	},
+	{
+		country_short: 'SY',
+		region: 'Al Qunaytirah',
+		city: 'Khan Arnabah',
+	},
+	{
+		country_short: 'SY',
+		region: 'Dayr az Zawr',
+		city: 'Dayr az Zawr',
+	},
+	{
+		country_short: 'UA',
+		region: 'Vinnytska oblast',
+		city: 'Kozyatyn',
+	},
+	{
+		country_short: 'UA',
+		region: 'Volynska oblast',
+		city: 'Lutsk',
+	},
+	{
+		country_short: 'UA',
+		region: 'Mykolaivska oblast',
+		city: 'Ochakiv',
+	},
+	{
+		country_short: 'UA',
+		region: 'Chernihivska oblast',
+		city: 'Nizhyn',
+	},
+	{
+		country_short: 'UA',
+		region: 'Kirovohradska oblast',
+		city: "Svitlovods'k",
+	},
+	{
+		country_short: 'UA',
+		region: 'Khmelnytska oblast',
+		city: 'Shepetivka',
+	},
+	{
+		country_short: 'UA',
+		region: 'Dnipropetrovska oblast',
+		city: 'Kryvyy Rih',
+	},
+	{
+		country_short: 'LT',
+		region: 'Telsiu apskritis',
+		city: 'Telsiai',
+	},
+	{
+		country_short: 'RU',
+		region: 'Saha, Respublika',
+		city: 'Saha, Respublika',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Karlovarsky kraj',
+		city: 'Sokolov',
+	},
+	{
+		country_short: 'CH',
+		region: 'Vaud',
+		city: 'Crissier',
+	},
+	{
+		country_short: 'NL',
+		region: 'Groningen',
+		city: 'Korrewegwijk',
+	},
+	{
+		country_short: 'RO',
+		region: 'Ilfov',
+		city: 'Chiajna',
+	},
+	{
+		country_short: 'RO',
+		region: 'Vrancea',
+		city: 'Focsani',
+	},
+	{
+		country_short: 'RO',
+		region: 'Arad',
+		city: 'Arad',
+	},
+	{
+		country_short: 'RO',
+		region: 'Alba',
+		city: 'Alba Iulia',
+	},
+	{
+		country_short: 'RO',
+		region: 'Bistrita-Nasaud',
+		city: 'Bistrita',
+	},
+	{
+		country_short: 'RO',
+		region: 'Vaslui',
+		city: 'Vaslui',
+	},
+	{
+		country_short: 'RO',
+		region: 'Mures',
+		city: 'Iernut',
+	},
+	{
+		country_short: 'RO',
+		region: 'Salaj',
+		city: 'Zalau',
+	},
+	{
+		country_short: 'RO',
+		region: 'Prahova',
+		city: 'Ploiesti',
+	},
+	{
+		country_short: 'RO',
+		region: 'Iasi',
+		city: 'Iasi',
+	},
+	{
+		country_short: 'RO',
+		region: 'Cluj',
+		city: 'Cluj-Napoca',
+	},
+	{
+		country_short: 'RO',
+		region: 'Galati',
+		city: 'Galati',
+	},
+	{
+		country_short: 'RO',
+		region: 'Braila',
+		city: 'Rosiori',
+	},
+	{
+		country_short: 'RO',
+		region: 'Constanta',
+		city: 'Constanta',
+	},
+	{
+		country_short: 'RO',
+		region: 'Mehedinti',
+		city: 'Douazeci si Trei August',
+	},
+	{
+		country_short: 'RO',
+		region: 'Sibiu',
+		city: 'Sibiu',
+	},
+	{
+		country_short: 'RO',
+		region: 'Harghita',
+		city: 'Tulghes',
+	},
+	{
+		country_short: 'RO',
+		region: 'Ialomita',
+		city: 'Ciulnita',
+	},
+	{
+		country_short: 'RO',
+		region: 'Teleorman',
+		city: 'Traian',
+	},
+	{
+		country_short: 'RO',
+		region: 'Buzau',
+		city: 'Buzau',
+	},
+	{
+		country_short: 'RO',
+		region: 'Tulcea',
+		city: 'Tulcea',
+	},
+	{
+		country_short: 'RO',
+		region: 'Calarasi',
+		city: 'Calarasi',
+	},
+	{
+		country_short: 'RO',
+		region: 'Dambovita',
+		city: 'Produlesti',
+	},
+	{
+		country_short: 'RO',
+		region: 'Bacau',
+		city: 'Onesti',
+	},
+	{
+		country_short: 'RU',
+		region: 'Altay, Respublika',
+		city: 'Altay, Respublika',
+	},
+	{
+		country_short: 'RU',
+		region: "Murmanskaya oblast'",
+		city: 'Murmansk',
+	},
+	{
+		country_short: 'RU',
+		region: "Orenburgskaya oblast'",
+		city: 'Orsk',
+	},
+	{
+		country_short: 'RU',
+		region: 'Udmurtskaya Respublika',
+		city: 'Izhevsk',
+	},
+	{
+		country_short: 'RU',
+		region: "Tambovskaya oblast'",
+		city: 'Sosnovka',
+	},
+	{
+		country_short: 'RU',
+		region: "Belgorodskaya oblast'",
+		city: 'Belgorod',
+	},
+	{
+		country_short: 'LB',
+		region: 'Beyrouth',
+		city: 'Beirut',
+	},
+	{
+		country_short: 'LB',
+		region: 'Beqaa',
+		city: 'Zahle',
+	},
+	{
+		country_short: 'IQ',
+		region: 'As Sulaymaniyah',
+		city: 'Halabjah',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Arbil',
+		city: 'Kuysanjaq',
+	},
+	{
+		country_short: 'GE',
+		region: 'Guria',
+		city: 'Meria',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Baki',
+		city: 'Baku',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Harare',
+		city: 'Harare',
+	},
+	{
+		country_short: 'CD',
+		region: 'Kinshasa',
+		city: 'Kinshasa',
+	},
+	{
+		country_short: 'IQ',
+		region: 'An Najaf',
+		city: 'Najaf',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Ninawa',
+		city: 'Mosul',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Kirkuk',
+		city: 'Kirkuk',
+	},
+	{
+		country_short: 'RU',
+		region: 'Severnaya Osetiya, Respublika',
+		city: 'Severnaya Osetiya, Respublika',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kutahya',
+		city: 'Kutahya',
+	},
+	{
+		country_short: 'TR',
+		region: 'Canakkale',
+		city: 'Kepez',
+	},
+	{
+		country_short: 'TR',
+		region: 'Mersin',
+		city: 'Anamur',
+	},
+	{
+		country_short: 'TR',
+		region: 'Manisa',
+		city: 'Manisa',
+	},
+	{
+		country_short: 'TR',
+		region: 'Adana',
+		city: 'Adana',
+	},
+	{
+		country_short: 'TR',
+		region: 'Nigde',
+		city: 'Ulukisla',
+	},
+	{
+		country_short: 'RO',
+		region: 'Giurgiu',
+		city: 'Gaiseni',
+	},
+	{
+		country_short: 'RO',
+		region: 'Neamt',
+		city: 'Ungureni',
+	},
+	{
+		country_short: 'RO',
+		region: 'Covasna',
+		city: 'Tirgu Ocna',
+	},
+	{
+		country_short: 'RO',
+		region: 'Dolj',
+		city: 'Craiova',
+	},
+	{
+		country_short: 'RO',
+		region: 'Caras-Severin',
+		city: 'Resita',
+	},
+	{
+		country_short: 'RO',
+		region: 'Olt',
+		city: 'Slatina',
+	},
+	{
+		country_short: 'RO',
+		region: 'Maramures',
+		city: 'Seini',
+	},
+	{
+		country_short: 'LT',
+		region: 'Utenos apskritis',
+		city: 'Visaginas',
+	},
+	{
+		country_short: 'LT',
+		region: 'Marijampoles apskritis',
+		city: 'Marijampole',
+	},
+	{
+		country_short: 'LT',
+		region: 'Alytaus apskritis',
+		city: 'Alytus',
+	},
+	{
+		country_short: 'LT',
+		region: 'Klaipedos apskritis',
+		city: 'Silute',
+	},
+	{
+		country_short: 'OM',
+		region: 'Masqat',
+		city: 'Muscat',
+	},
+	{
+		country_short: 'OM',
+		region: 'Zufar',
+		city: 'Salalah',
+	},
+	{
+		country_short: 'OM',
+		region: 'Al Wusta',
+		city: 'Sawqarah',
+	},
+	{
+		country_short: 'OM',
+		region: 'Ad Dakhiliyah',
+		city: 'Ar Raddah',
+	},
+	{
+		country_short: 'OM',
+		region: 'Shamal al Batinah',
+		city: 'As Suwayq',
+	},
+	{
+		country_short: 'OM',
+		region: 'Janub ash Sharqiyah',
+		city: 'Sur',
+	},
+	{
+		country_short: 'OM',
+		region: 'Az Zahirah',
+		city: "'Ibri",
+	},
+	{
+		country_short: 'OM',
+		region: 'Janub al Batinah',
+		city: "Barka'",
+	},
+	{
+		country_short: 'OM',
+		region: 'Shamal ash Sharqiyah',
+		city: "Ibra'",
+	},
+	{
+		country_short: 'SK',
+		region: 'Nitriansky kraj',
+		city: 'Zlate Moravce',
+	},
+	{
+		country_short: 'RS',
+		region: 'Nisavski okrug',
+		city: 'Nis',
+	},
+	{
+		country_short: 'NL',
+		region: 'Fryslan',
+		city: 'Sneek',
+	},
+	{
+		country_short: 'IS',
+		region: 'Sudurland',
+		city: 'Selfoss',
+	},
+	{
+		country_short: 'IS',
+		region: 'Sudurnes',
+		city: 'Njardvik',
+	},
+	{
+		country_short: 'IS',
+		region: 'Austurland',
+		city: 'Neskaupstadur',
+	},
+	{
+		country_short: 'RU',
+		region: "Ryazanskaya oblast'",
+		city: "Ryazan'",
+	},
+	{
+		country_short: 'BE',
+		region: 'Vlaams-Brabant',
+		city: 'Landen',
+	},
+	{
+		country_short: 'BE',
+		region: 'Luxembourg',
+		city: 'Neufchateau',
+	},
+	{
+		country_short: 'BE',
+		region: 'Namur',
+		city: 'Beauraing',
+	},
+	{
+		country_short: 'BE',
+		region: 'Hainaut',
+		city: 'La Louviere',
+	},
+	{
+		country_short: 'BE',
+		region: 'Brabant wallon',
+		city: 'Tubize',
+	},
+	{
+		country_short: 'TR',
+		region: 'Elazig',
+		city: 'Sivrice',
+	},
+	{
+		country_short: 'TR',
+		region: 'Bingol',
+		city: 'Bingol',
+	},
+	{
+		country_short: 'TR',
+		region: 'Sanliurfa',
+		city: 'Sanliurfa',
+	},
+	{
+		country_short: 'TR',
+		region: 'Mardin',
+		city: 'Mardin',
+	},
+	{
+		country_short: 'TR',
+		region: 'Diyarbakir',
+		city: 'Yuksek',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kocaeli',
+		city: 'Gebze',
+	},
+	{
+		country_short: 'TR',
+		region: 'Sakarya',
+		city: 'Adapazari',
+	},
+	{
+		country_short: 'TR',
+		region: 'Yalova',
+		city: 'Kadikoy',
+	},
+	{
+		country_short: 'TR',
+		region: 'Mugla',
+		city: 'Dalaman',
+	},
+	{
+		country_short: 'TR',
+		region: 'Usak',
+		city: 'Sivasli',
+	},
+	{
+		country_short: 'TR',
+		region: 'Isparta',
+		city: 'Isparta',
+	},
+	{
+		country_short: 'TR',
+		region: 'Burdur',
+		city: 'Bucak',
+	},
+	{
+		country_short: 'TR',
+		region: 'Denizli',
+		city: 'Denizli',
+	},
+	{
+		country_short: 'TR',
+		region: 'Balikesir',
+		city: 'Susurluk',
+	},
+	{
+		country_short: 'TR',
+		region: 'Aydin',
+		city: 'Didim',
+	},
+	{
+		country_short: 'TR',
+		region: 'Sinop',
+		city: 'Sinop',
+	},
+	{
+		country_short: 'TR',
+		region: 'Rize',
+		city: 'Rize',
+	},
+	{
+		country_short: 'TR',
+		region: 'Konya',
+		city: 'Konya',
+	},
+	{
+		country_short: 'TR',
+		region: 'Karaman',
+		city: 'Karaman',
+	},
+	{
+		country_short: 'TR',
+		region: 'Ordu',
+		city: 'Fatsa',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kayseri',
+		city: 'Incesu',
+	},
+	{
+		country_short: 'TR',
+		region: 'Trabzon',
+		city: 'Trabzon',
+	},
+	{
+		country_short: 'TR',
+		region: 'Adiyaman',
+		city: 'Adiyaman',
+	},
+	{
+		country_short: 'TR',
+		region: 'Gumushane',
+		city: 'Kelkit',
+	},
+	{
+		country_short: 'TR',
+		region: 'Artvin',
+		city: 'Artvin',
+	},
+	{
+		country_short: 'TR',
+		region: 'Bolu',
+		city: 'Gerede',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kastamonu',
+		city: 'Devrekani',
+	},
+	{
+		country_short: 'TR',
+		region: 'Aksaray',
+		city: 'Eskil',
+	},
+	{
+		country_short: 'TR',
+		region: 'Van',
+		city: 'Ercis',
+	},
+	{
+		country_short: 'TR',
+		region: 'Giresun',
+		city: 'Camoluk',
+	},
+	{
+		country_short: 'TR',
+		region: 'Duzce',
+		city: 'Golyaka',
+	},
+	{
+		country_short: 'TR',
+		region: 'Cankiri',
+		city: 'Cankiri',
+	},
+	{
+		country_short: 'TR',
+		region: 'Samsun',
+		city: 'Bafra',
+	},
+	{
+		country_short: 'TR',
+		region: 'Erzurum',
+		city: 'Erzurum',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kars',
+		city: 'Sarikamis',
+	},
+	{
+		country_short: 'TR',
+		region: 'Corum',
+		city: 'Corum',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kirsehir',
+		city: 'Kirsehir',
+	},
+	{
+		country_short: 'TR',
+		region: 'Afyonkarahisar',
+		city: 'Sandikli',
+	},
+	{
+		country_short: 'TR',
+		region: 'Eskisehir',
+		city: 'Eskisehir',
+	},
+	{
+		country_short: 'TR',
+		region: 'Hatay',
+		city: 'Antioch',
+	},
+	{
+		country_short: 'TR',
+		region: 'Hakkari',
+		city: 'Semdinli',
+	},
+	{
+		country_short: 'TR',
+		region: 'Malatya',
+		city: 'Malatya',
+	},
+	{
+		country_short: 'TR',
+		region: 'Tekirdag',
+		city: 'Muratli',
+	},
+	{
+		country_short: 'TR',
+		region: 'Agri',
+		city: 'Agri',
+	},
+	{
+		country_short: 'TR',
+		region: 'Edirne',
+		city: 'Kesan',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kirikkale',
+		city: 'Kirikkale',
+	},
+	{
+		country_short: 'TR',
+		region: 'Yozgat',
+		city: 'Yozgat',
+	},
+	{
+		country_short: 'TR',
+		region: 'Zonguldak',
+		city: 'Guluc',
+	},
+	{
+		country_short: 'TR',
+		region: 'Sirnak',
+		city: 'Bozalan',
+	},
+	{
+		country_short: 'TR',
+		region: 'Bilecik',
+		city: 'Osmaneli',
+	},
+	{
+		country_short: 'BG',
+		region: 'Kyustendil',
+		city: 'Dupnitsa',
+	},
+	{
+		country_short: 'BG',
+		region: 'Kardzhali',
+		city: 'Kardzhali',
+	},
+	{
+		country_short: 'SI',
+		region: 'Velenje',
+		city: 'Velenje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Domzale',
+		city: 'Domzale',
+	},
+	{
+		country_short: 'MK',
+		region: 'Bitola',
+		city: 'Bitola',
+	},
+	{
+		country_short: 'MK',
+		region: 'Struga',
+		city: 'Struga',
+	},
+	{
+		country_short: 'MK',
+		region: 'Centar',
+		city: 'Skopje',
+	},
+	{
+		country_short: 'MK',
+		region: 'Debar',
+		city: 'Debar',
+	},
+	{
+		country_short: 'LI',
+		region: 'Mauren',
+		city: 'Mauren',
+	},
+	{
+		country_short: 'LI',
+		region: 'Schaan',
+		city: 'Schaan',
+	},
+	{
+		country_short: 'LI',
+		region: 'Vaduz',
+		city: 'Vaduz',
+	},
+	{
+		country_short: 'LI',
+		region: 'Ruggell',
+		city: 'Ruggell',
+	},
+	{
+		country_short: 'LI',
+		region: 'Gamprin',
+		city: 'Gamprin',
+	},
+	{
+		country_short: 'LI',
+		region: 'Triesen',
+		city: 'Triesen',
+	},
+	{
+		country_short: 'LI',
+		region: 'Balzers',
+		city: 'Balzers',
+	},
+	{
+		country_short: 'JE',
+		region: 'Jersey',
+		city: 'Saint Helier',
+	},
+	{
+		country_short: 'OM',
+		region: 'Al Buraymi',
+		city: 'Al Buraymi',
+	},
+	{
+		country_short: 'OM',
+		region: 'Musandam',
+		city: 'Khasab',
+	},
+	{
+		country_short: 'HU',
+		region: 'Csongrad-Csanad',
+		city: 'Szentes',
+	},
+	{
+		country_short: 'HU',
+		region: 'Pest',
+		city: 'Toeroekbalint',
+	},
+	{
+		country_short: 'HU',
+		region: 'Veszprem',
+		city: 'Tapolca',
+	},
+	{
+		country_short: 'HR',
+		region: 'Krapinsko-zagorska zupanija',
+		city: 'Zabok',
+	},
+	{
+		country_short: 'HR',
+		region: 'Bjelovarsko-bilogorska zupanija',
+		city: 'Garesnica',
+	},
+	{
+		country_short: 'HR',
+		region: 'Karlovacka zupanija',
+		city: 'Ostarije',
+	},
+	{
+		country_short: 'HR',
+		region: 'Vukovarsko-srijemska zupanija',
+		city: 'Rokovci',
+	},
+	{
+		country_short: 'HR',
+		region: 'Koprivnicko-krizevacka zupanija',
+		city: 'Koprivnica',
+	},
+	{
+		country_short: 'HR',
+		region: 'Brodsko-posavska zupanija',
+		city: 'Davor',
+	},
+	{
+		country_short: 'HR',
+		region: 'Primorsko-goranska zupanija',
+		city: 'Krk',
+	},
+	{
+		country_short: 'HR',
+		region: 'Zagrebacka zupanija',
+		city: 'Samobor',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Stredocesky kraj',
+		city: 'Jirny',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Kraj Vysocina',
+		city: 'Pelhrimov',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Moravskoslezsky kraj',
+		city: 'Ostrava',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Ustecky kraj',
+		city: 'Chomutov',
+	},
+	{
+		country_short: 'SA',
+		region: 'Jazan',
+		city: 'Mizhirah',
+	},
+	{
+		country_short: 'SA',
+		region: 'Al Bahah',
+		city: 'Al Bahah',
+	},
+	{
+		country_short: 'SA',
+		region: 'Najran',
+		city: 'Najran',
+	},
+	{
+		country_short: 'IE',
+		region: 'Kildare',
+		city: 'Naas',
+	},
+	{
+		country_short: 'PT',
+		region: 'Setubal',
+		city: 'Santo Andre',
+	},
+	{
+		country_short: 'PT',
+		region: 'Evora',
+		city: 'Viana do Alentejo',
+	},
+	{
+		country_short: 'BA',
+		region: 'Federacija Bosne i Hercegovine',
+		city: 'Zenica',
+	},
+	{
+		country_short: 'HR',
+		region: 'Pozesko-slavonska zupanija',
+		city: 'Pozega',
+	},
+	{
+		country_short: 'HR',
+		region: 'Sisacko-moslavacka zupanija',
+		city: 'Kutina',
+	},
+	{
+		country_short: 'HR',
+		region: 'Varazdinska zupanija',
+		city: 'Varazdin',
+	},
+	{
+		country_short: 'HR',
+		region: 'Licko-senjska zupanija',
+		city: 'Gospic',
+	},
+	{
+		country_short: 'HR',
+		region: 'Osjecko-baranjska zupanija',
+		city: 'Valpovo',
+	},
+	{
+		country_short: 'HR',
+		region: 'Zadarska zupanija',
+		city: 'Biograd na Moru',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Jihocesky kraj',
+		city: 'Ceske Budejovice',
+	},
+	{
+		country_short: 'RU',
+		region: 'Komi, Respublika',
+		city: 'Komi, Respublika',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Saki',
+		city: 'Sheki',
+	},
+	{
+		country_short: 'RU',
+		region: "Sakhalinskaya oblast'",
+		city: 'Korsakov',
+	},
+	{
+		country_short: 'PY',
+		region: 'Asuncion',
+		city: 'Asuncion',
+	},
+	{
+		country_short: 'CH',
+		region: 'Basel-Landschaft',
+		city: 'Pratteln',
+	},
+	{
+		country_short: 'CH',
+		region: 'Aargau',
+		city: 'Baden',
+	},
+	{
+		country_short: 'GE',
+		region: "K'akheti",
+		city: 'Sagarejo',
+	},
+	{
+		country_short: 'AT',
+		region: 'Steiermark',
+		city: 'Grambach',
+	},
+	{
+		country_short: 'EE',
+		region: 'Ida-Virumaa',
+		city: 'Johvi',
+	},
+	{
+		country_short: 'JO',
+		region: 'Irbid',
+		city: 'Irbid',
+	},
+	{
+		country_short: 'JO',
+		region: "Az Zarqa'",
+		city: 'Zarqa',
+	},
+	{
+		country_short: 'JO',
+		region: "Ma'an",
+		city: 'Qir Moav',
+	},
+	{
+		country_short: 'BY',
+		region: "Minskaya voblasts'",
+		city: 'Minsk',
+	},
+	{
+		country_short: 'TR',
+		region: 'Nevsehir',
+		city: 'Nevsehir',
+	},
+	{
+		country_short: 'TR',
+		region: 'Bartin',
+		city: 'Amasra',
+	},
+	{
+		country_short: 'TR',
+		region: 'Osmaniye',
+		city: 'Toprakkale',
+	},
+	{
+		country_short: 'TR',
+		region: 'Amasya',
+		city: 'Merzifon',
+	},
+	{
+		country_short: 'TR',
+		region: 'Bitlis',
+		city: 'Tatvan',
+	},
+	{
+		country_short: 'TR',
+		region: 'Batman',
+		city: 'Batman',
+	},
+	{
+		country_short: 'TR',
+		region: 'Siirt',
+		city: 'Siirt',
+	},
+	{
+		country_short: 'TR',
+		region: 'Karabuk',
+		city: 'Karabuk',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Pardubicky kraj',
+		city: 'Policka',
+	},
+	{
+		country_short: 'RU',
+		region: 'Khanty-Mansiyskiy avtonomnyy okrug',
+		city: 'Surgut',
+	},
+	{
+		country_short: 'UA',
+		region: 'Poltavska oblast',
+		city: 'Pyryatyn',
+	},
+	{
+		country_short: 'UA',
+		region: 'Lvivska oblast',
+		city: "L'viv",
+	},
+	{
+		country_short: 'UA',
+		region: 'Sumska oblast',
+		city: 'Romny',
+	},
+	{
+		country_short: 'UA',
+		region: 'Odeska oblast',
+		city: 'Odessa',
+	},
+	{
+		country_short: 'UA',
+		region: 'Luhanska oblast',
+		city: 'Svatove',
+	},
+	{
+		country_short: 'BG',
+		region: 'Sofia',
+		city: 'Bozhurishte',
+	},
+	{
+		country_short: 'BG',
+		region: 'Plovdiv',
+		city: 'Plovdiv',
+	},
+	{
+		country_short: 'BG',
+		region: 'Montana',
+		city: 'Lom',
+	},
+	{
+		country_short: 'BG',
+		region: 'Stara Zagora',
+		city: 'Chirpan',
+	},
+	{
+		country_short: 'BG',
+		region: 'Varna',
+		city: 'Varna',
+	},
+	{
+		country_short: 'BG',
+		region: 'Gabrovo',
+		city: 'Gabrovo',
+	},
+	{
+		country_short: 'BG',
+		region: 'Pleven',
+		city: 'Pleven',
+	},
+	{
+		country_short: 'BG',
+		region: 'Pazardzhik',
+		city: 'Pazardzhik',
+	},
+	{
+		country_short: 'MD',
+		region: 'Balti',
+		city: 'Balti',
+	},
+	{
+		country_short: 'MD',
+		region: 'Ocnita',
+		city: 'Otaci',
+	},
+	{
+		country_short: 'MD',
+		region: 'Riscani',
+		city: 'Riscani',
+	},
+	{
+		country_short: 'MD',
+		region: 'Gagauzia, Unitatea teritoriala autonoma',
+		city: 'Gagauzia, Unitatea teritoriala autonoma',
+	},
+	{
+		country_short: 'MD',
+		region: 'Edinet',
+		city: 'Cupcini',
+	},
+	{
+		country_short: 'MD',
+		region: 'Rezina',
+		city: 'Rezina',
+	},
+	{
+		country_short: 'MD',
+		region: 'Glodeni',
+		city: 'Glodeni',
+	},
+	{
+		country_short: 'MD',
+		region: 'Causeni',
+		city: 'Causeni',
+	},
+	{
+		country_short: 'MD',
+		region: 'Ungheni',
+		city: 'Ungheni',
+	},
+	{
+		country_short: 'MD',
+		region: 'Singerei',
+		city: 'Singerei',
+	},
+	{
+		country_short: 'MD',
+		region: 'Telenesti',
+		city: 'Telenesti',
+	},
+	{
+		country_short: 'MD',
+		region: 'Cimislia',
+		city: 'Cimislia',
+	},
+	{
+		country_short: 'MD',
+		region: 'Orhei',
+		city: 'Orhei',
+	},
+	{
+		country_short: 'MD',
+		region: 'Cahul',
+		city: 'Cahul',
+	},
+	{
+		country_short: 'MD',
+		region: 'Nisporeni',
+		city: 'Nisporeni',
+	},
+	{
+		country_short: 'LB',
+		region: 'Mont-Liban',
+		city: 'Jdaidet el Matn',
+	},
+	{
+		country_short: 'KG',
+		region: 'Chuy',
+		city: 'Lebedinovka',
+	},
+	{
+		country_short: 'KG',
+		region: 'Bishkek Shaary',
+		city: 'Bishkek',
+	},
+	{
+		country_short: 'UA',
+		region: 'Chernivetska oblast',
+		city: 'Kelmentsi',
+	},
+	{
+		country_short: 'PL',
+		region: 'Podkarpackie',
+		city: 'Debica',
+	},
+	{
+		country_short: 'CH',
+		region: 'Valais',
+		city: 'Leuk',
+	},
+	{
+		country_short: 'RU',
+		region: 'Dagestan, Respublika',
+		city: 'Dagestan, Respublika',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Kralovehradecky kraj',
+		city: 'Stare Nechanice',
+	},
+	{
+		country_short: 'SK',
+		region: 'Presovsky kraj',
+		city: 'Presov',
+	},
+	{
+		country_short: 'HR',
+		region: 'Viroviticko-podravska zupanija',
+		city: 'Virovitica',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Zlinsky kraj',
+		city: 'Vsetin',
+	},
+	{
+		country_short: 'RU',
+		region: 'Karachayevo-Cherkesskaya Respublika',
+		city: 'Kardonikskaya',
+	},
+	{
+		country_short: 'BA',
+		region: 'Republika Srpska',
+		city: 'Ugljevik',
+	},
+	{
+		country_short: 'BA',
+		region: 'Brcko distrikt',
+		city: 'Cerik',
+	},
+	{
+		country_short: 'SK',
+		region: 'Zilinsky kraj',
+		city: 'Liptovsky Mikulas',
+	},
+	{
+		country_short: 'SK',
+		region: 'Kosicky kraj',
+		city: 'Kosice',
+	},
+	{
+		country_short: 'NL',
+		region: 'Overijssel',
+		city: 'Hengelo',
+	},
+	{
+		country_short: 'PL',
+		region: 'Warminsko-mazurskie',
+		city: 'Mragowo',
+	},
+	{
+		country_short: 'PL',
+		region: 'Lubuskie',
+		city: 'Zagan',
+	},
+	{
+		country_short: 'PL',
+		region: 'Podlaskie',
+		city: 'Rajgrod',
+	},
+	{
+		country_short: 'PL',
+		region: 'Kujawsko-pomorskie',
+		city: 'Strzelno',
+	},
+	{
+		country_short: 'PL',
+		region: 'Pomorskie',
+		city: 'Gdansk',
+	},
+	{
+		country_short: 'FI',
+		region: 'Kymenlaakso',
+		city: 'Hamina',
+	},
+	{
+		country_short: 'HU',
+		region: 'Hajdu-Bihar',
+		city: 'Hajduboszormeny',
+	},
+	{
+		country_short: 'PH',
+		region: 'Benguet',
+		city: 'Baguio',
+	},
+	{
+		country_short: 'VE',
+		region: 'Distrito Capital',
+		city: 'Caracas',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Jihomoravsky kraj',
+		city: 'Brno',
+	},
+	{
+		country_short: 'US',
+		region: 'North Dakota',
+		city: 'Karlsruhe',
+	},
+	{
+		country_short: 'IM',
+		region: 'Isle of Man',
+		city: 'Douglas',
+	},
+	{
+		country_short: 'MT',
+		region: 'Valletta',
+		city: 'Valletta',
+	},
+	{
+		country_short: 'GG',
+		region: 'Guernsey',
+		city: 'Saint Peter Port',
+	},
+	{
+		country_short: 'MT',
+		region: "Ta' Xbiex",
+		city: "Ta' Xbiex",
+	},
+	{
+		country_short: 'IE',
+		region: 'Tipperary',
+		city: 'Tipperary',
+	},
+	{
+		country_short: 'GI',
+		region: 'Gibraltar',
+		city: 'Gibraltar',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Wasit',
+		city: 'Al Kut',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Babil',
+		city: 'Al Hillah',
+	},
+	{
+		country_short: 'LY',
+		region: 'Tarabulus',
+		city: 'Tripoli',
+	},
+	{
+		country_short: 'AM',
+		region: "Kotayk'",
+		city: 'Abovyan',
+	},
+	{
+		country_short: 'AM',
+		region: 'Tavus',
+		city: 'Dilijan',
+	},
+	{
+		country_short: 'AM',
+		region: 'Lori',
+		city: 'Gyulagarak',
+	},
+	{
+		country_short: 'RU',
+		region: "Tomskaya oblast'",
+		city: 'Tomsk',
+	},
+	{
+		country_short: 'RU',
+		region: 'Buryatiya, Respublika',
+		city: 'Buryatiya, Respublika',
+	},
+	{
+		country_short: 'AM',
+		region: "Gegark'unik'",
+		city: 'Vaghashen',
+	},
+	{
+		country_short: 'AM',
+		region: 'Sirak',
+		city: 'Gyumri',
+	},
+	{
+		country_short: 'AM',
+		region: 'Armavir',
+		city: 'Merdzavan',
+	},
+	{
+		country_short: 'AM',
+		region: 'Ararat',
+		city: 'Ararat',
+	},
+	{
+		country_short: 'AM',
+		region: 'Vayoc Jor',
+		city: 'Armash',
+	},
+	{
+		country_short: 'AM',
+		region: 'Aragacotn',
+		city: 'Byurakan',
+	},
+	{
+		country_short: 'UA',
+		region: 'Zhytomyrska oblast',
+		city: "Korosten'",
+	},
+	{
+		country_short: 'FI',
+		region: 'Varsinais-Suomi',
+		city: 'Turku',
+	},
+	{
+		country_short: 'IE',
+		region: 'Roscommon',
+		city: 'Roscommon',
+	},
+	{
+		country_short: 'IE',
+		region: 'Galway',
+		city: 'Ballinasloe',
+	},
+	{
+		country_short: 'IE',
+		region: 'Longford',
+		city: 'Longford',
+	},
+	{
+		country_short: 'YE',
+		region: "Amanat al 'Asimah",
+		city: 'Sanaa',
+	},
+	{
+		country_short: 'YE',
+		region: 'Hadramawt',
+		city: 'Al Mukalla',
+	},
+	{
+		country_short: 'YE',
+		region: "Ta'izz",
+		city: 'Mawiyah',
+	},
+	{
+		country_short: 'BY',
+		region: 'Horad Minsk',
+		city: "Uruch'ye",
+	},
+	{
+		country_short: 'BY',
+		region: "Hrodzyenskaya voblasts'",
+		city: 'Ashmyany',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Toshkent',
+		city: 'Tashkent',
+	},
+	{
+		country_short: 'CH',
+		region: 'Sankt Gallen',
+		city: 'Sankt Gallen',
+	},
+	{
+		country_short: 'YT',
+		region: 'Mamoudzou',
+		city: 'Mamoudzou',
+	},
+	{
+		country_short: 'RE',
+		region: 'Reunion',
+		city: 'Reunion',
+	},
+	{
+		country_short: 'GP',
+		region: 'Guadeloupe',
+		city: 'Baie-Mahault',
+	},
+	{
+		country_short: 'MF',
+		region: 'Saint Martin (French Part)',
+		city: 'Marigot',
+	},
+	{
+		country_short: 'MQ',
+		region: 'Martinique',
+		city: 'Le Lamentin',
+	},
+	{
+		country_short: 'GF',
+		region: 'Guyane',
+		city: 'Cayenne',
+	},
+	{
+		country_short: 'KW',
+		region: 'Hawalli',
+		city: 'Bayan',
+	},
+	{
+		country_short: 'CH',
+		region: 'Luzern',
+		city: 'Meierskappel',
+	},
+	{
+		country_short: 'UA',
+		region: 'Cherkaska oblast',
+		city: 'Kaniv',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Auckland',
+		city: 'Auckland',
+	},
+	{
+		country_short: 'CH',
+		region: 'Ticino',
+		city: 'Agno',
+	},
+	{
+		country_short: 'CH',
+		region: 'Fribourg',
+		city: 'Bulle',
+	},
+	{
+		country_short: 'RS',
+		region: 'Macvanski okrug',
+		city: 'Vladimirci',
+	},
+	{
+		country_short: 'RS',
+		region: 'Zlatiborski okrug',
+		city: 'Osjecenik',
+	},
+	{
+		country_short: 'RS',
+		region: 'Podunavski okrug',
+		city: 'Smederevska Palanka',
+	},
+	{
+		country_short: 'RS',
+		region: 'Prizrenski okrug',
+		city: 'Leposavic',
+	},
+	{
+		country_short: 'RU',
+		region: "Zabaykal'skiy kray",
+		city: 'Gazimurskiy Zavod',
+	},
+	{
+		country_short: 'RU',
+		region: 'Tyva, Respublika',
+		city: 'Tyva, Respublika',
+	},
+	{
+		country_short: 'RU',
+		region: "Pskovskaya oblast'",
+		city: 'Pskov',
+	},
+	{
+		country_short: 'RU',
+		region: 'Kabardino-Balkarskaya Respublika',
+		city: 'Nartkala',
+	},
+	{
+		country_short: 'CH',
+		region: 'Solothurn',
+		city: 'Solothurn',
+	},
+	{
+		country_short: 'BR',
+		region: 'Mato Grosso',
+		city: 'Feitoria do Tine',
+	},
+	{
+		country_short: 'CO',
+		region: 'Cundinamarca',
+		city: 'San Antonio del Tequendama',
+	},
+	{
+		country_short: 'PE',
+		region: 'Ucayali',
+		city: 'Aguaytia',
+	},
+	{
+		country_short: 'MX',
+		region: 'Zacatecas',
+		city: 'Canitas de Felipe Pescador',
+	},
+	{
+		country_short: 'PA',
+		region: 'Cocle',
+		city: 'El Cope',
+	},
+	{
+		country_short: 'UY',
+		region: 'Durazno',
+		city: 'La Paloma',
+	},
+	{
+		country_short: 'AR',
+		region: 'La Pampa',
+		city: 'Jacinto Arauz',
+	},
+	{
+		country_short: 'CH',
+		region: 'Basel-Stadt',
+		city: 'Basel',
+	},
+	{
+		country_short: 'HU',
+		region: 'Fejer',
+		city: 'Gardony',
+	},
+	{
+		country_short: 'IE',
+		region: 'Wicklow',
+		city: 'Wicklow',
+	},
+	{
+		country_short: 'GE',
+		region: 'Mtskheta-Mtianeti',
+		city: 'Zahesi',
+	},
+	{
+		country_short: 'GE',
+		region: 'Ajaria',
+		city: 'Batumi',
+	},
+	{
+		country_short: 'GE',
+		region: 'Imereti',
+		city: 'Kutaisi',
+	},
+	{
+		country_short: 'GE',
+		region: 'Kvemo Kartli',
+		city: "Tsqnet'i",
+	},
+	{
+		country_short: 'GE',
+		region: 'Shida Kartli',
+		city: 'Gori',
+	},
+	{
+		country_short: 'GE',
+		region: 'Samegrelo-Zemo Svaneti',
+		city: "P'ot'i",
+	},
+	{
+		country_short: 'GE',
+		region: 'Samtskhe-Javakheti',
+		city: 'Akhaltsikhe',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Plzensky kraj',
+		city: 'Susice',
+	},
+	{
+		country_short: 'IE',
+		region: 'Louth',
+		city: 'Drogheda',
+	},
+	{
+		country_short: 'SI',
+		region: 'Puconci',
+		city: 'Gorica',
+	},
+	{
+		country_short: 'LK',
+		region: 'Western Province',
+		city: 'Colombo',
+	},
+	{
+		country_short: 'PT',
+		region: 'Beja',
+		city: 'Sao Teotonio',
+	},
+	{
+		country_short: 'AT',
+		region: 'Salzburg',
+		city: 'Bad Gastein',
+	},
+	{
+		country_short: 'RU',
+		region: "Magadanskaya oblast'",
+		city: 'Magadan',
+	},
+	{
+		country_short: 'PL',
+		region: 'Opolskie',
+		city: 'Kietrz',
+	},
+	{
+		country_short: 'SZ',
+		region: 'Hhohho',
+		city: 'Mbabane',
+	},
+	{
+		country_short: 'TR',
+		region: 'Bayburt',
+		city: 'Bayburt',
+	},
+	{
+		country_short: 'TR',
+		region: 'Erzincan',
+		city: 'Erzincan',
+	},
+	{
+		country_short: 'TR',
+		region: 'Mus',
+		city: 'Mus',
+	},
+	{
+		country_short: 'TR',
+		region: 'Tokat',
+		city: 'Tokat',
+	},
+	{
+		country_short: 'TR',
+		region: 'Sivas',
+		city: 'Zara',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Sumqayit',
+		city: 'Sumqayit',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Xacmaz',
+		city: 'Xacmaz',
+	},
+	{
+		country_short: 'SK',
+		region: 'Trnavsky kraj',
+		city: 'Dunajska Streda',
+	},
+	{
+		country_short: 'IE',
+		region: 'Meath',
+		city: 'Dunboyne',
+	},
+	{
+		country_short: 'HU',
+		region: 'Baranya',
+		city: 'Pecs',
+	},
+	{
+		country_short: 'UA',
+		region: 'Zaporizka oblast',
+		city: 'Rostushche',
+	},
+	{
+		country_short: 'IQ',
+		region: "Karbala'",
+		city: 'Sulaymaniyah',
+	},
+	{
+		country_short: 'KW',
+		region: "Al 'Asimah",
+		city: 'Kuwait',
+	},
+	{
+		country_short: 'BD',
+		region: 'Dhaka',
+		city: 'Dhaka',
+	},
+	{
+		country_short: 'BT',
+		region: 'Trongsa',
+		city: 'Trongsa',
+	},
+	{
+		country_short: 'BN',
+		region: 'Brunei-Muara',
+		city: 'Peramu',
+	},
+	{
+		country_short: 'HU',
+		region: 'Bekes',
+		city: 'Bekescsaba',
+	},
+	{
+		country_short: 'HU',
+		region: 'Somogy',
+		city: 'Marcali',
+	},
+	{
+		country_short: 'HU',
+		region: 'Komarom-Esztergom',
+		city: 'Kisber',
+	},
+	{
+		country_short: 'HU',
+		region: 'Gyor-Moson-Sopron',
+		city: 'Nagycenk',
+	},
+	{
+		country_short: 'HU',
+		region: 'Vas',
+		city: 'Buk',
+	},
+	{
+		country_short: 'CY',
+		region: 'Keryneia',
+		city: 'Kyrenia',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Siyazan',
+		city: 'Alykhanly',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Masalli',
+		city: 'Boradigah',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Ganca',
+		city: 'Ganja',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Abseron',
+		city: 'Saray',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Mingacevir',
+		city: 'Mingelchaur',
+	},
+	{
+		country_short: 'LT',
+		region: 'Siauliu apskritis',
+		city: 'Siauliai',
+	},
+	{
+		country_short: 'HU',
+		region: 'Jasz-Nagykun-Szolnok',
+		city: 'Szolnok',
+	},
+	{
+		country_short: 'HU',
+		region: 'Zala',
+		city: 'Zalakomar',
+	},
+	{
+		country_short: 'HU',
+		region: 'Tolna',
+		city: 'Szekszard',
+	},
+	{
+		country_short: 'HU',
+		region: 'Heves',
+		city: 'Belapatfalva',
+	},
+	{
+		country_short: 'RS',
+		region: 'Kosovsko-Mitrovacki okrug',
+		city: 'Pristina',
+	},
+	{
+		country_short: 'CH',
+		region: 'Thurgau',
+		city: 'Frauenfeld',
+	},
+	{
+		country_short: 'CH',
+		region: 'Schwyz',
+		city: 'Wollerau',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kilis',
+		city: 'Kilis',
+	},
+	{
+		country_short: 'UA',
+		region: 'Khersonska oblast',
+		city: 'Nova Kakhovka',
+	},
+	{
+		country_short: 'UA',
+		region: 'Rivnenska oblast',
+		city: 'Rivne',
+	},
+	{
+		country_short: 'PT',
+		region: 'Regiao Autonoma dos Acores',
+		city: 'Norte',
+	},
+	{
+		country_short: 'PM',
+		region: 'Saint Pierre and Miquelon',
+		city: 'Miquelon',
+	},
+	{
+		country_short: 'RS',
+		region: 'Pomoravski okrug',
+		city: 'Dubnica',
+	},
+	{
+		country_short: 'RS',
+		region: 'Sumadijski okrug',
+		city: 'Petrovac',
+	},
+	{
+		country_short: 'FI',
+		region: 'Etela-Pohjanmaa',
+		city: 'Seinajoki',
+	},
+	{
+		country_short: 'IE',
+		region: 'Clare',
+		city: 'Shannon',
+	},
+	{
+		country_short: 'LA',
+		region: 'Viangchan',
+		city: 'Vientiane',
+	},
+	{
+		country_short: 'RO',
+		region: 'Botosani',
+		city: 'Paltinis',
+	},
+	{
+		country_short: 'YE',
+		region: "'Adan",
+		city: "Al Ma'alla'",
+	},
+	{
+		country_short: 'YE',
+		region: 'Hajjah',
+		city: 'Suq Shamar',
+	},
+	{
+		country_short: 'YE',
+		region: "Sa'dah",
+		city: "Sa'dah",
+	},
+	{
+		country_short: 'YE',
+		region: 'Al Hudaydah',
+		city: 'Al Hudaydah',
+	},
+	{
+		country_short: 'YE',
+		region: "San'a'",
+		city: 'Sahar',
+	},
+	{
+		country_short: 'YE',
+		region: "Ma'rib",
+		city: 'Suq Sirwah',
+	},
+	{
+		country_short: 'YE',
+		region: "Al Bayda'",
+		city: "Rada'",
+	},
+	{
+		country_short: 'AI',
+		region: 'Anguilla',
+		city: 'The Valley',
+	},
+	{
+		country_short: 'GU',
+		region: 'Barrigada',
+		city: 'Barrigada Village',
+	},
+	{
+		country_short: 'GU',
+		region: 'Dededo',
+		city: 'Dededo Municipality',
+	},
+	{
+		country_short: 'MP',
+		region: 'Northern Mariana Islands',
+		city: 'Saipan',
+	},
+	{
+		country_short: 'DO',
+		region: 'Distrito Nacional (Santo Domingo)',
+		city: 'Santo Domingo',
+	},
+	{
+		country_short: 'DO',
+		region: 'La Vega',
+		city: 'Tireo Arriba',
+	},
+	{
+		country_short: 'BT',
+		region: 'Thimphu',
+		city: 'Thimphu',
+	},
+	{
+		country_short: 'CN',
+		region: 'Hubei',
+		city: 'Wuhan',
+	},
+	{
+		country_short: 'NG',
+		region: 'Lagos',
+		city: 'Lagos',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Kwazulu-Natal',
+		city: 'Durban',
+	},
+	{
+		country_short: 'CA',
+		region: 'Manitoba',
+		city: 'Winnipeg',
+	},
+	{
+		country_short: 'PR',
+		region: 'Humacao',
+		city: 'Humacao',
+	},
+	{
+		country_short: 'EC',
+		region: 'Pichincha',
+		city: 'Quito',
+	},
+	{
+		country_short: 'BR',
+		region: 'Minas Gerais',
+		city: 'Belo Horizonte',
+	},
+	{
+		country_short: 'EC',
+		region: 'Guayas',
+		city: 'Guayaquil',
+	},
+	{
+		country_short: 'CN',
+		region: 'Sichuan',
+		city: 'Chengdu',
+	},
+	{
+		country_short: 'BR',
+		region: 'Acre',
+		city: 'Minas Gerais',
+	},
+	{
+		country_short: 'BR',
+		region: 'Tocantins',
+		city: 'Parana',
+	},
+	{
+		country_short: 'CO',
+		region: 'Quindio',
+		city: 'Armenia',
+	},
+	{
+		country_short: 'CO',
+		region: 'Atlantico',
+		city: 'Barranquilla',
+	},
+	{
+		country_short: 'CO',
+		region: 'Risaralda',
+		city: 'Pereira',
+	},
+	{
+		country_short: 'CO',
+		region: 'Antioquia',
+		city: 'Antioquia',
+	},
+	{
+		country_short: 'CO',
+		region: 'Valle del Cauca',
+		city: 'Cali',
+	},
+	{
+		country_short: 'CO',
+		region: 'Bolivar',
+		city: 'Cordoba',
+	},
+	{
+		country_short: 'CO',
+		region: 'Meta',
+		city: 'Puerto Gaitan',
+	},
+	{
+		country_short: 'CO',
+		region: 'Cesar',
+		city: 'Valledupar',
+	},
+	{
+		country_short: 'CO',
+		region: 'Casanare',
+		city: 'Cauca',
+	},
+	{
+		country_short: 'CO',
+		region: 'Santander',
+		city: 'Barbosa',
+	},
+	{
+		country_short: 'CO',
+		region: 'Tolima',
+		city: 'Ibague',
+	},
+	{
+		country_short: 'CO',
+		region: 'Caldas',
+		city: 'Manzanares',
+	},
+	{
+		country_short: 'CO',
+		region: 'Narino',
+		city: 'Ipiales',
+	},
+	{
+		country_short: 'EC',
+		region: 'Zamora Chinchipe',
+		city: 'Zamora',
+	},
+	{
+		country_short: 'EC',
+		region: 'Cotopaxi',
+		city: 'Latacunga',
+	},
+	{
+		country_short: 'EC',
+		region: 'Santo Domingo de los Tsachilas',
+		city: 'Francisco de Orellana',
+	},
+	{
+		country_short: 'EC',
+		region: 'El Oro',
+		city: 'Portovelo',
+	},
+	{
+		country_short: 'EC',
+		region: 'Los Rios',
+		city: 'Quevedo',
+	},
+	{
+		country_short: 'EC',
+		region: 'Azuay',
+		city: 'Cuenca',
+	},
+	{
+		country_short: 'EC',
+		region: 'Tungurahua',
+		city: 'Ambato',
+	},
+	{
+		country_short: 'CO',
+		region: 'Huila',
+		city: 'Palermo',
+	},
+	{
+		country_short: 'CO',
+		region: 'Norte de Santander',
+		city: 'Cucuta',
+	},
+	{
+		country_short: 'CO',
+		region: 'Amazonas',
+		city: 'Tolima',
+	},
+	{
+		country_short: 'CO',
+		region: 'Sucre',
+		city: 'Sucre',
+	},
+	{
+		country_short: 'CO',
+		region: 'Cauca',
+		city: 'Popayan',
+	},
+	{
+		country_short: 'CR',
+		region: 'San Jose',
+		city: 'San Jose',
+	},
+	{
+		country_short: 'PE',
+		region: 'Arequipa',
+		city: 'Camana',
+	},
+	{
+		country_short: 'MX',
+		region: 'Mexico',
+		city: 'Tlalnepantla',
+	},
+	{
+		country_short: 'PR',
+		region: 'Ponce',
+		city: 'Ponce',
+	},
+	{
+		country_short: 'PR',
+		region: 'Guaynabo',
+		city: 'Guaynabo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Salinas',
+		city: 'Coco',
+	},
+	{
+		country_short: 'PR',
+		region: 'Cidra',
+		city: 'Bayamon',
+	},
+	{
+		country_short: 'VI',
+		region: 'Virgin Islands, U.S.',
+		city: 'Virgin Islands, U.S.',
+	},
+	{
+		country_short: 'PR',
+		region: 'San Juan',
+		city: 'San Juan',
+	},
+	{
+		country_short: 'PR',
+		region: 'Carolina',
+		city: 'Carolina',
+	},
+	{
+		country_short: 'PR',
+		region: 'Barceloneta',
+		city: 'Barceloneta',
+	},
+	{
+		country_short: 'PR',
+		region: 'Rio Grande',
+		city: 'Rio Grande',
+	},
+	{
+		country_short: 'PR',
+		region: 'Manati',
+		city: 'Manati',
+	},
+	{
+		country_short: 'PR',
+		region: 'Dorado',
+		city: 'Dorado',
+	},
+	{
+		country_short: 'PR',
+		region: 'Vega Alta',
+		city: 'Vega Alta',
+	},
+	{
+		country_short: 'PR',
+		region: 'Arecibo',
+		city: 'Arecibo',
+	},
+	{
+		country_short: 'SR',
+		region: 'Paramaribo',
+		city: 'Paramaribo',
+	},
+	{
+		country_short: 'BO',
+		region: 'La Paz',
+		city: 'La Paz',
+	},
+	{
+		country_short: 'PR',
+		region: 'Caguas',
+		city: 'Caguas',
+	},
+	{
+		country_short: 'PR',
+		region: 'Aguadilla',
+		city: 'Aguadilla',
+	},
+	{
+		country_short: 'PR',
+		region: 'Canovanas',
+		city: 'Canovanas',
+	},
+	{
+		country_short: 'PR',
+		region: 'Mayaguez',
+		city: 'Mayaguez',
+	},
+	{
+		country_short: 'PR',
+		region: 'Hatillo',
+		city: 'Hatillo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Cayey',
+		city: 'Cayey',
+	},
+	{
+		country_short: 'PR',
+		region: 'Gurabo',
+		city: 'Gurabo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Morovis',
+		city: 'Morovis',
+	},
+	{
+		country_short: 'PR',
+		region: 'Catano',
+		city: 'Catano',
+	},
+	{
+		country_short: 'PR',
+		region: 'Guayama',
+		city: 'Guayama',
+	},
+	{
+		country_short: 'PR',
+		region: 'Toa Alta',
+		city: 'Pajaros',
+	},
+	{
+		country_short: 'BH',
+		region: 'Al Muharraq',
+		city: 'Al Muharraq',
+	},
+	{
+		country_short: 'CN',
+		region: 'Guangxi Zhuangzu',
+		city: 'Nanning',
+	},
+	{
+		country_short: 'PK',
+		region: 'Sindh',
+		city: 'Karachi',
+	},
+	{
+		country_short: 'MN',
+		region: 'Ulaanbaatar',
+		city: 'Ulaanbaatar',
+	},
+	{
+		country_short: 'JP',
+		region: 'Ishikawa',
+		city: 'Kanazawa',
+	},
+	{
+		country_short: 'ID',
+		region: 'Jawa Barat',
+		city: 'Bandung',
+	},
+	{
+		country_short: 'PH',
+		region: 'Surigao del Sur',
+		city: 'Cantilan',
+	},
+	{
+		country_short: 'CN',
+		region: 'Chongqing',
+		city: 'Chongqing',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Wellington',
+		city: 'Wellington',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Otago',
+		city: 'Dunedin',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Bay of Plenty',
+		city: 'Tauranga',
+	},
+	{
+		country_short: 'PG',
+		region: 'Chimbu',
+		city: 'Kundiawa',
+	},
+	{
+		country_short: 'TL',
+		region: 'Dili',
+		city: 'Dili',
+	},
+	{
+		country_short: 'SB',
+		region: 'Guadalcanal',
+		city: 'Honiara',
+	},
+	{
+		country_short: 'PG',
+		region: 'Bougainville',
+		city: 'Panguna',
+	},
+	{
+		country_short: 'SB',
+		region: 'Western',
+		city: 'Gizo',
+	},
+	{
+		country_short: 'VU',
+		region: 'Shefa',
+		city: 'Port-Vila',
+	},
+	{
+		country_short: 'FJ',
+		region: 'Central',
+		city: 'Suva',
+	},
+	{
+		country_short: 'GU',
+		region: 'Piti',
+		city: 'Piti Village',
+	},
+	{
+		country_short: 'CK',
+		region: 'Cook Islands',
+		city: 'Avarua',
+	},
+	{
+		country_short: 'VU',
+		region: 'Torba',
+		city: 'Sola',
+	},
+	{
+		country_short: 'PG',
+		region: 'Milne Bay',
+		city: 'Samarai',
+	},
+	{
+		country_short: 'PG',
+		region: 'Central',
+		city: 'Idumava',
+	},
+	{
+		country_short: 'PG',
+		region: 'West New Britain',
+		city: 'Kimbe',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Canterbury',
+		city: 'Christchurch',
+	},
+	{
+		country_short: 'NZ',
+		region: 'West Coast',
+		city: 'Haast',
+	},
+	{
+		country_short: 'TO',
+		region: 'Tongatapu',
+		city: "Nuku'alofa",
+	},
+	{
+		country_short: 'FJ',
+		region: 'Rotuma',
+		city: 'Gaol',
+	},
+	{
+		country_short: 'PG',
+		region: 'Manus',
+		city: 'Lorengau',
+	},
+	{
+		country_short: 'NP',
+		region: 'Bagmati',
+		city: 'Kathmandu',
+	},
+	{
+		country_short: 'KE',
+		region: 'Nairobi City',
+		city: 'Nairobi',
+	},
+	{
+		country_short: 'IN',
+		region: 'Nagaland',
+		city: 'Kohima',
+	},
+	{
+		country_short: 'IN',
+		region: 'Sikkim',
+		city: 'Gangtok',
+	},
+	{
+		country_short: 'IN',
+		region: 'Arunachal Pradesh',
+		city: 'Naharlagun',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ha Nam',
+		city: 'Phu Ly',
+	},
+	{
+		country_short: 'VN',
+		region: 'Dak Nong',
+		city: "B'tong",
+	},
+	{
+		country_short: 'VN',
+		region: 'Bac Lieu',
+		city: 'Bac Lieu',
+	},
+	{
+		country_short: 'VN',
+		region: 'Hau Giang',
+		city: 'Vi Thanh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Binh Phuoc',
+		city: 'Binh Long',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ha Tinh',
+		city: 'Ha Tinh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Son La',
+		city: 'Son La',
+	},
+	{
+		country_short: 'VN',
+		region: 'Hoa Binh',
+		city: 'Hoa Binh',
+	},
+	{
+		country_short: 'VN',
+		region: 'Quang Tri',
+		city: 'Dong Ha',
+	},
+	{
+		country_short: 'VN',
+		region: 'Lai Chau',
+		city: 'Phong Tho',
+	},
+	{
+		country_short: 'VN',
+		region: 'Bac Kan',
+		city: 'Bac Kan',
+	},
+	{
+		country_short: 'VN',
+		region: 'Ha Giang',
+		city: 'Ha Giang',
+	},
+	{
+		country_short: 'PG',
+		region: 'National Capital District (Port Moresby)',
+		city: 'Port Moresby',
+	},
+	{
+		country_short: 'CN',
+		region: 'Hebei',
+		city: 'Shijiazhuang',
+	},
+	{
+		country_short: 'CN',
+		region: 'Liaoning',
+		city: 'Dalian',
+	},
+	{
+		country_short: 'CN',
+		region: 'Yunnan',
+		city: 'Tengyue',
+	},
+	{
+		country_short: 'CN',
+		region: 'Hainan',
+		city: 'Dacheng',
+	},
+	{
+		country_short: 'CN',
+		region: 'Hunan',
+		city: 'Huaqiao',
+	},
+	{
+		country_short: 'CN',
+		region: 'Gansu',
+		city: 'Yulong',
+	},
+	{
+		country_short: 'CN',
+		region: 'Anhui',
+		city: 'Chengjia',
+	},
+	{
+		country_short: 'FI',
+		region: 'Pohjois-Savo',
+		city: 'Kuopio',
+	},
+	{
+		country_short: 'CN',
+		region: 'Shandong',
+		city: 'Weifang',
+	},
+	{
+		country_short: 'CN',
+		region: 'Tianjin',
+		city: 'Tianjin',
+	},
+	{
+		country_short: 'MO',
+		region: 'Macao',
+		city: 'Macau',
+	},
+	{
+		country_short: 'BR',
+		region: 'Pernambuco',
+		city: 'Parnamirim',
+	},
+	{
+		country_short: 'NI',
+		region: 'Managua',
+		city: 'Managua',
+	},
+	{
+		country_short: 'JM',
+		region: 'Kingston',
+		city: 'Kingston',
+	},
+	{
+		country_short: 'AL',
+		region: 'Tirane',
+		city: 'Tirana',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Qahirah',
+		city: 'Cairo',
+	},
+	{
+		country_short: 'TT',
+		region: 'Port of Spain',
+		city: 'Port of Spain',
+	},
+	{
+		country_short: 'MX',
+		region: 'Baja California',
+		city: 'Puebla',
+	},
+	{
+		country_short: 'MX',
+		region: 'Sonora',
+		city: 'Hermosillo',
+	},
+	{
+		country_short: 'MX',
+		region: 'Morelos',
+		city: 'Tlalnepantla',
+	},
+	{
+		country_short: 'PH',
+		region: 'Cebu',
+		city: 'Cebu City',
+	},
+	{
+		country_short: 'MX',
+		region: 'Jalisco',
+		city: 'Guadalajara',
+	},
+	{
+		country_short: 'ID',
+		region: 'Jawa Timur',
+		city: 'Surabaya',
+	},
+	{
+		country_short: 'MX',
+		region: 'Quintana Roo',
+		city: 'Cancun',
+	},
+	{
+		country_short: 'ID',
+		region: 'Riau',
+		city: 'Pekanbaru',
+	},
+	{
+		country_short: 'BR',
+		region: 'Goias',
+		city: 'Goiania',
+	},
+	{
+		country_short: 'GT',
+		region: 'Guatemala',
+		city: 'Guatemala City',
+	},
+	{
+		country_short: 'ID',
+		region: 'Banten',
+		city: 'Tangerang',
+	},
+	{
+		country_short: 'CR',
+		region: 'Alajuela',
+		city: 'Alajuela',
+	},
+	{
+		country_short: 'AF',
+		region: 'Kabul',
+		city: 'Kabul',
+	},
+	{
+		country_short: 'AF',
+		region: 'Helmand',
+		city: 'Gereshk',
+	},
+	{
+		country_short: 'AF',
+		region: 'Farah',
+		city: 'Farah',
+	},
+	{
+		country_short: 'AF',
+		region: 'Herat',
+		city: 'Herat',
+	},
+	{
+		country_short: 'AF',
+		region: 'Jowzjan',
+		city: 'Shibirghan',
+	},
+	{
+		country_short: 'AF',
+		region: 'Badghis',
+		city: 'Ghormach',
+	},
+	{
+		country_short: 'AF',
+		region: 'Samangan',
+		city: 'Aibak',
+	},
+	{
+		country_short: 'AF',
+		region: 'Baghlan',
+		city: 'Pul-e Khumri',
+	},
+	{
+		country_short: 'AF',
+		region: 'Takhar',
+		city: 'Taloqan',
+	},
+	{
+		country_short: 'AF',
+		region: 'Kunduz',
+		city: 'Kunduz',
+	},
+	{
+		country_short: 'BG',
+		region: 'Ruse',
+		city: 'Ruse',
+	},
+	{
+		country_short: 'RU',
+		region: "Vladimirskaya oblast'",
+		city: 'Murom',
+	},
+	{
+		country_short: 'MA',
+		region: 'Beni-Mellal-Khenifra',
+		city: 'Khenifra',
+	},
+	{
+		country_short: 'MA',
+		region: 'Tanger-Tetouan-Al Hoceima',
+		city: 'Tangier',
+	},
+	{
+		country_short: 'PR',
+		region: 'San Sebastian',
+		city: 'San Sebastian',
+	},
+	{
+		country_short: 'PR',
+		region: 'Aguada',
+		city: 'Aguada',
+	},
+	{
+		country_short: 'PR',
+		region: 'Villalba',
+		city: 'Villalba',
+	},
+	{
+		country_short: 'PR',
+		region: 'Trujillo Alto',
+		city: 'Trujillo Alto',
+	},
+	{
+		country_short: 'GD',
+		region: 'Saint George',
+		city: "Saint George's",
+	},
+	{
+		country_short: 'VG',
+		region: 'Virgin Islands, British',
+		city: 'Virgin Islands, British',
+	},
+	{
+		country_short: 'PR',
+		region: 'Cabo Rojo',
+		city: 'Cabo Rojo',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint George Basseterre',
+		city: 'Basseterre',
+	},
+	{
+		country_short: 'AG',
+		region: 'Saint John',
+		city: "Saint John's",
+	},
+	{
+		country_short: 'PR',
+		region: 'Naranjito',
+		city: 'Naranjito',
+	},
+	{
+		country_short: 'PR',
+		region: 'Barranquitas',
+		city: 'Barranquitas',
+	},
+	{
+		country_short: 'BL',
+		region: 'Saint Barthelemy',
+		city: 'Gustavia',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint John Figtree',
+		city: "Saint Peter's",
+	},
+	{
+		country_short: 'PR',
+		region: 'Adjuntas',
+		city: 'Adjuntas',
+	},
+	{
+		country_short: 'CA',
+		region: 'Newfoundland and Labrador',
+		city: "St. John's",
+	},
+	{
+		country_short: 'PR',
+		region: 'Camuy',
+		city: 'Camuy',
+	},
+	{
+		country_short: 'VC',
+		region: 'Saint George',
+		city: 'Kingstown',
+	},
+	{
+		country_short: 'PR',
+		region: 'Corozal',
+		city: 'Corozal',
+	},
+	{
+		country_short: 'BR',
+		region: 'Alagoas',
+		city: 'Maceio',
+	},
+	{
+		country_short: 'BS',
+		region: 'New Providence',
+		city: 'Nassau',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint George',
+		city: 'Roseau',
+	},
+	{
+		country_short: 'KY',
+		region: 'Cayman Islands',
+		city: 'George Town',
+	},
+	{
+		country_short: 'LC',
+		region: 'Castries',
+		city: 'Bisee',
+	},
+	{
+		country_short: 'PR',
+		region: 'Fajardo',
+		city: 'Fajardo',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sulawesi Selatan',
+		city: 'Makassar',
+	},
+	{
+		country_short: 'ID',
+		region: 'Kalimantan Selatan',
+		city: 'Banjarmasin',
+	},
+	{
+		country_short: 'PH',
+		region: 'Laguna',
+		city: 'Calamba',
+	},
+	{
+		country_short: 'MM',
+		region: 'Yangon',
+		city: 'Yangon',
+	},
+	{
+		country_short: 'PH',
+		region: 'Quezon',
+		city: 'Lucena',
+	},
+	{
+		country_short: 'MX',
+		region: 'Tamaulipas',
+		city: 'Reynosa',
+	},
+	{
+		country_short: 'CL',
+		region: 'Arica y Parinacota',
+		city: 'Arica',
+	},
+	{
+		country_short: 'CL',
+		region: 'Los Lagos',
+		city: 'Puerto Varas',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint Michael',
+		city: 'Bridgetown',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint John',
+		city: 'Saint Margarets',
+	},
+	{
+		country_short: 'PR',
+		region: 'Bayamon',
+		city: 'Bayamon',
+	},
+	{
+		country_short: 'PR',
+		region: 'Loiza',
+		city: 'Loiza',
+	},
+	{
+		country_short: 'MX',
+		region: 'Campeche',
+		city: 'Campeche',
+	},
+	{
+		country_short: 'PR',
+		region: 'Utuado',
+		city: 'Utuado',
+	},
+	{
+		country_short: 'PR',
+		region: 'Vega Baja',
+		city: 'Vega Baja',
+	},
+	{
+		country_short: 'PR',
+		region: 'Luquillo',
+		city: 'Luquillo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Yabucoa',
+		city: 'Yabucoa',
+	},
+	{
+		country_short: 'PR',
+		region: 'Naguabo',
+		city: 'Naguabo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Hormigueros',
+		city: 'Hormigueros',
+	},
+	{
+		country_short: 'PR',
+		region: 'Sabana Grande',
+		city: 'Sabana Grande',
+	},
+	{
+		country_short: 'PR',
+		region: 'Comerio',
+		city: 'Comerio',
+	},
+	{
+		country_short: 'PR',
+		region: 'Santa Isabel Municipio',
+		city: 'Santa Isabel',
+	},
+	{
+		country_short: 'PR',
+		region: 'Aibonito',
+		city: 'Aibonito',
+	},
+	{
+		country_short: 'PR',
+		region: 'Municipio de Juncos',
+		city: 'Juncos',
+	},
+	{
+		country_short: 'PR',
+		region: 'Toa Baja',
+		city: 'Levittown',
+	},
+	{
+		country_short: 'PR',
+		region: 'Lares',
+		city: 'Lares',
+	},
+	{
+		country_short: 'PR',
+		region: 'Las Piedras',
+		city: 'La Fermina',
+	},
+	{
+		country_short: 'PR',
+		region: 'Quebradillas',
+		city: 'Quebradillas',
+	},
+	{
+		country_short: 'PR',
+		region: 'Municipio de Jayuya',
+		city: 'Jayuya',
+	},
+	{
+		country_short: 'PR',
+		region: 'Penuelas',
+		city: 'Tallaboa Alta',
+	},
+	{
+		country_short: 'PR',
+		region: 'San Lorenzo',
+		city: 'San Lorenzo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Moca',
+		city: 'Moca',
+	},
+	{
+		country_short: 'PR',
+		region: 'Guanica',
+		city: 'Guanica',
+	},
+	{
+		country_short: 'PR',
+		region: 'San German',
+		city: 'San German',
+	},
+	{
+		country_short: 'PR',
+		region: 'Patillas',
+		city: 'Patillas',
+	},
+	{
+		country_short: 'PR',
+		region: 'Arroyo',
+		city: 'Arroyo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Maunabo',
+		city: 'Maunabo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Coamo',
+		city: 'Coamo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Lajas',
+		city: 'Lajas',
+	},
+	{
+		country_short: 'PR',
+		region: 'Ciales',
+		city: 'Ciales',
+	},
+	{
+		country_short: 'PR',
+		region: 'Aguas Buenas',
+		city: 'Aguas Buenas',
+	},
+	{
+		country_short: 'BS',
+		region: 'South Eleuthera',
+		city: 'Rock Sound',
+	},
+	{
+		country_short: 'BS',
+		region: 'City of Freeport',
+		city: 'Lucaya',
+	},
+	{
+		country_short: 'BS',
+		region: 'Central Abaco',
+		city: 'Marsh Harbour',
+	},
+	{
+		country_short: 'BS',
+		region: 'West Grand Bahama',
+		city: 'West End',
+	},
+	{
+		country_short: 'PR',
+		region: 'Juana Diaz',
+		city: 'Aguilita',
+	},
+	{
+		country_short: 'PR',
+		region: 'Rincon',
+		city: 'Rincon',
+	},
+	{
+		country_short: 'PR',
+		region: 'Anasco',
+		city: 'Anasco',
+	},
+	{
+		country_short: 'PR',
+		region: 'Isabela',
+		city: 'Mora',
+	},
+	{
+		country_short: 'LC',
+		region: 'Gros Islet',
+		city: 'Gros Islet',
+	},
+	{
+		country_short: 'LC',
+		region: 'Laborie',
+		city: 'Laborie',
+	},
+	{
+		country_short: 'LC',
+		region: 'Micoud',
+		city: 'Micoud',
+	},
+	{
+		country_short: 'RS',
+		region: 'Borski okrug',
+		city: 'Bor',
+	},
+	{
+		country_short: 'RS',
+		region: 'Jablanicki okrug',
+		city: 'Leskovac',
+	},
+	{
+		country_short: 'RS',
+		region: 'Juznobacki okrug',
+		city: 'Novi Sad',
+	},
+	{
+		country_short: 'RS',
+		region: 'Moravicki okrug',
+		city: 'Cacak',
+	},
+	{
+		country_short: 'RS',
+		region: 'Sremski okrug',
+		city: 'Stara Pazova',
+	},
+	{
+		country_short: 'RS',
+		region: 'Raski okrug',
+		city: 'Kraljevo',
+	},
+	{
+		country_short: 'RS',
+		region: 'Pirotski okrug',
+		city: 'Pirot',
+	},
+	{
+		country_short: 'RS',
+		region: 'Rasinski okrug',
+		city: 'Krusevac',
+	},
+	{
+		country_short: 'RS',
+		region: 'Juznobanatski okrug',
+		city: 'Pancevo',
+	},
+	{
+		country_short: 'PR',
+		region: 'Guayanilla',
+		city: 'Magas Arriba',
+	},
+	{
+		country_short: 'PR',
+		region: 'Florida',
+		city: 'Florida',
+	},
+	{
+		country_short: 'PR',
+		region: 'Las Marias',
+		city: 'Las Marias',
+	},
+	{
+		country_short: 'PR',
+		region: 'Yauco',
+		city: 'Yauco',
+	},
+	{
+		country_short: 'PR',
+		region: 'Vieques',
+		city: 'Esperanza',
+	},
+	{
+		country_short: 'PR',
+		region: 'Ceiba',
+		city: 'Ceiba',
+	},
+	{
+		country_short: 'BR',
+		region: 'Rondonia',
+		city: 'Jaru',
+	},
+	{
+		country_short: 'BR',
+		region: 'Amazonas',
+		city: 'Manaus',
+	},
+	{
+		country_short: 'PY',
+		region: 'Caaguazu',
+		city: 'Coronel Oviedo',
+	},
+	{
+		country_short: 'DO',
+		region: 'Sanchez Ramirez',
+		city: 'Cevicos',
+	},
+	{
+		country_short: 'DO',
+		region: 'Santiago',
+		city: 'Santiago de los Caballeros',
+	},
+	{
+		country_short: 'GT',
+		region: 'Jalapa',
+		city: 'Jalapa',
+	},
+	{
+		country_short: 'AR',
+		region: 'Buenos Aires',
+		city: 'Conesa',
+	},
+	{
+		country_short: 'BR',
+		region: 'Espirito Santo',
+		city: 'Castelo',
+	},
+	{
+		country_short: 'BR',
+		region: 'Santa Catarina',
+		city: 'Blumenau',
+	},
+	{
+		country_short: 'BR',
+		region: 'Maranhao',
+		city: 'Sao Luis',
+	},
+	{
+		country_short: 'UM',
+		region: 'Palmyra Atoll',
+		city: 'Palmyra Atoll',
+	},
+	{
+		country_short: 'BS',
+		region: 'North Andros',
+		city: 'San Andros',
+	},
+	{
+		country_short: 'AR',
+		region: 'Cordoba',
+		city: 'San Francisco',
+	},
+	{
+		country_short: 'AR',
+		region: 'Entre Rios',
+		city: 'Parana',
+	},
+	{
+		country_short: 'AR',
+		region: 'Santa Fe',
+		city: 'Rafaela',
+	},
+	{
+		country_short: 'AR',
+		region: 'Salta',
+		city: 'Salta',
+	},
+	{
+		country_short: 'AR',
+		region: 'Corrientes',
+		city: 'Corrientes',
+	},
+	{
+		country_short: 'AR',
+		region: 'Neuquen',
+		city: 'Neuquen',
+	},
+	{
+		country_short: 'BS',
+		region: 'Harbour Island',
+		city: 'Dunmore Town',
+	},
+	{
+		country_short: 'BS',
+		region: 'North Eleuthera',
+		city: 'Alice Town',
+	},
+	{
+		country_short: 'NP',
+		region: 'Seti',
+		city: 'Tikapur',
+	},
+	{
+		country_short: 'NP',
+		region: 'Gandaki',
+		city: 'Pokhara',
+	},
+	{
+		country_short: 'NP',
+		region: 'Kosi',
+		city: 'Ithari',
+	},
+	{
+		country_short: 'NP',
+		region: 'Mechi',
+		city: 'Ilam',
+	},
+	{
+		country_short: 'NP',
+		region: 'Lumbini',
+		city: 'Siddharthanagar',
+	},
+	{
+		country_short: 'NP',
+		region: 'Rapti',
+		city: 'Tulsipur',
+	},
+	{
+		country_short: 'NP',
+		region: 'Narayani',
+		city: 'Hetauda',
+	},
+	{
+		country_short: 'NP',
+		region: 'Bheri',
+		city: 'Gulariya',
+	},
+	{
+		country_short: 'NP',
+		region: 'Janakpur',
+		city: 'Janakpur',
+	},
+	{
+		country_short: 'NP',
+		region: 'Sagarmatha',
+		city: 'Sukhipur',
+	},
+	{
+		country_short: 'TM',
+		region: 'Ahal',
+		city: 'Ashgabat',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sumatera Utara',
+		city: 'Medan',
+	},
+	{
+		country_short: 'ID',
+		region: 'Bali',
+		city: 'Denpasar',
+	},
+	{
+		country_short: 'PK',
+		region: 'Azad Jammu and Kashmir',
+		city: 'New Mirpur',
+	},
+	{
+		country_short: 'BD',
+		region: 'Chattogram',
+		city: 'Laksham',
+	},
+	{
+		country_short: 'BD',
+		region: 'Sylhet',
+		city: 'Sylhet',
+	},
+	{
+		country_short: 'TK',
+		region: 'Tokelau',
+		city: 'Fale old settlement',
+	},
+	{
+		country_short: 'PH',
+		region: 'Bataan',
+		city: 'Roosevelt',
+	},
+	{
+		country_short: 'PH',
+		region: 'Nueva Ecija',
+		city: 'San Francisco',
+	},
+	{
+		country_short: 'PH',
+		region: 'Zambales',
+		city: 'San Juan',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Tasman',
+		city: 'Wakefield',
+	},
+	{
+		country_short: 'PH',
+		region: 'Mindoro Occidental',
+		city: 'Summit',
+	},
+	{
+		country_short: 'PH',
+		region: 'Davao del Sur',
+		city: 'Davao City',
+	},
+	{
+		country_short: 'PH',
+		region: 'Zamboanga del Norte',
+		city: 'Seres',
+	},
+	{
+		country_short: 'PH',
+		region: 'Rizal',
+		city: 'Sampaloc',
+	},
+	{
+		country_short: 'PH',
+		region: 'Batangas',
+		city: 'Batangas',
+	},
+	{
+		country_short: 'PH',
+		region: 'Lanao del Norte',
+		city: 'Maria Cristina',
+	},
+	{
+		country_short: 'PH',
+		region: 'Negros Occidental',
+		city: 'Bacolod City',
+	},
+	{
+		country_short: 'PH',
+		region: 'Aklan',
+		city: 'Kalibo',
+	},
+	{
+		country_short: 'PH',
+		region: 'Bukidnon',
+		city: 'Quezon',
+	},
+	{
+		country_short: 'PH',
+		region: 'Agusan del Norte',
+		city: 'Butuan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Cotabato',
+		city: 'New Cebu',
+	},
+	{
+		country_short: 'PH',
+		region: 'Misamis Oriental',
+		city: 'Cagayan de Oro',
+	},
+	{
+		country_short: 'PH',
+		region: 'Misamis Occidental',
+		city: 'Oroquieta',
+	},
+	{
+		country_short: 'PH',
+		region: 'Bohol',
+		city: 'Tagbilaran',
+	},
+	{
+		country_short: 'PH',
+		region: 'Sorsogon',
+		city: 'Bagacay',
+	},
+	{
+		country_short: 'PH',
+		region: 'Capiz',
+		city: 'Roxas City',
+	},
+	{
+		country_short: 'PH',
+		region: 'Zamboanga Sibugay',
+		city: 'Barangay Tetuan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Negros Oriental',
+		city: 'Dumaguete',
+	},
+	{
+		country_short: 'PH',
+		region: 'Batanes',
+		city: 'Tacloban',
+	},
+	{
+		country_short: 'PH',
+		region: 'Bulacan',
+		city: 'Plaridel',
+	},
+	{
+		country_short: 'PH',
+		region: 'Isabela',
+		city: 'Echague',
+	},
+	{
+		country_short: 'PH',
+		region: 'Cavite',
+		city: 'Patuto',
+	},
+	{
+		country_short: 'PH',
+		region: 'Zamboanga del Sur',
+		city: 'Kagawasan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Camarines Norte',
+		city: 'Santa Elena',
+	},
+	{
+		country_short: 'PH',
+		region: 'Antique',
+		city: 'Piape I',
+	},
+	{
+		country_short: 'PH',
+		region: 'Mindoro Oriental',
+		city: 'Pili',
+	},
+	{
+		country_short: 'MV',
+		region: 'Male',
+		city: 'Male',
+	},
+	{
+		country_short: 'MV',
+		region: 'South Maalhosmadulu',
+		city: 'Eydhafushi',
+	},
+	{
+		country_short: 'MV',
+		region: 'South Ari Atoll',
+		city: 'Mahibadhoo',
+	},
+	{
+		country_short: 'MV',
+		region: 'Mulaku Atoll',
+		city: 'Muli',
+	},
+	{
+		country_short: 'MV',
+		region: 'Felidhu Atoll',
+		city: 'Felidhoo',
+	},
+	{
+		country_short: 'MV',
+		region: 'Hahdhunmathi',
+		city: 'Hithadhoo',
+	},
+	{
+		country_short: 'MV',
+		region: 'Faadhippolhu',
+		city: 'Naifaru',
+	},
+	{
+		country_short: 'MV',
+		region: 'Addu City',
+		city: 'Meedhoo',
+	},
+	{
+		country_short: 'KH',
+		region: 'Banteay Mean Choay',
+		city: 'Paoy Pet',
+	},
+	{
+		country_short: 'KH',
+		region: 'Pailin',
+		city: 'Pailin',
+	},
+	{
+		country_short: 'ID',
+		region: 'Kepulauan Riau',
+		city: 'Riau',
+	},
+	{
+		country_short: 'NC',
+		region: 'Province Sud',
+		city: 'Noumea',
+	},
+	{
+		country_short: 'FJ',
+		region: 'Western',
+		city: 'Lautoka',
+	},
+	{
+		country_short: 'WF',
+		region: 'Uvea',
+		city: 'Mata-Utu',
+	},
+	{
+		country_short: 'BD',
+		region: 'Rajshahi',
+		city: 'Gaibandha',
+	},
+	{
+		country_short: 'BD',
+		region: 'Rangpur',
+		city: 'Rangpur',
+	},
+	{
+		country_short: 'BD',
+		region: 'Khulna',
+		city: 'Jessore',
+	},
+	{
+		country_short: 'BD',
+		region: 'Barishal',
+		city: 'Barisal',
+	},
+	{
+		country_short: 'NZ',
+		region: "Hawke's Bay",
+		city: 'Napier',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Gisborne',
+		city: 'Gisborne',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Northland',
+		city: 'Kerikeri',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Waikato',
+		city: 'Waiuku',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Manawatu-Wanganui',
+		city: 'Wanganui',
+	},
+	{
+		country_short: 'PK',
+		region: 'Punjab',
+		city: 'Rawalpindi',
+	},
+	{
+		country_short: 'MK',
+		region: 'Saraj',
+		city: 'Saraj',
+	},
+	{
+		country_short: 'MK',
+		region: 'Bogovinje',
+		city: 'Dolno Palciste',
+	},
+	{
+		country_short: 'MK',
+		region: 'Cucer Sandevo',
+		city: 'Shuto Orizari',
+	},
+	{
+		country_short: 'RO',
+		region: 'Suceava',
+		city: 'Straja',
+	},
+	{
+		country_short: 'RO',
+		region: 'Hunedoara',
+		city: 'Lupeni',
+	},
+	{
+		country_short: 'RO',
+		region: 'Gorj',
+		city: 'Godinesti',
+	},
+	{
+		country_short: 'CH',
+		region: 'Schaffhausen',
+		city: 'Schaffhausen',
+	},
+	{
+		country_short: 'FI',
+		region: 'Keski-Pohjanmaa',
+		city: 'Kotka',
+	},
+	{
+		country_short: 'IE',
+		region: 'Mayo',
+		city: 'Belmullet',
+	},
+	{
+		country_short: 'AT',
+		region: 'Burgenland',
+		city: 'Eisenstadt',
+	},
+	{
+		country_short: 'MK',
+		region: 'Kratovo',
+		city: 'Kratovo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Kumanovo',
+		city: 'Kumanovo',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Olomoucky kraj',
+		city: 'Prostejov',
+	},
+	{
+		country_short: 'RU',
+		region: 'Kamchatskiy kray',
+		city: 'Tilichiki',
+	},
+	{
+		country_short: 'RU',
+		region: 'Chukotskiy avtonomnyy okrug',
+		city: 'Provideniya',
+	},
+	{
+		country_short: 'RU',
+		region: "Amurskaya oblast'",
+		city: 'Tokur',
+	},
+	{
+		country_short: 'LI',
+		region: 'Eschen',
+		city: 'Eschen',
+	},
+	{
+		country_short: 'CH',
+		region: 'Neuchatel',
+		city: 'Neuchatel',
+	},
+	{
+		country_short: 'CH',
+		region: 'Appenzell Ausserrhoden',
+		city: 'Herisau',
+	},
+	{
+		country_short: 'QA',
+		region: 'Ar Rayyan',
+		city: 'Ar Rayyan',
+	},
+	{
+		country_short: 'QA',
+		region: 'Umm Salal',
+		city: 'Umm Salal Muhammad',
+	},
+	{
+		country_short: 'MK',
+		region: 'Strumica',
+		city: 'Strumica',
+	},
+	{
+		country_short: 'MK',
+		region: 'Brvenica',
+		city: 'Miletino',
+	},
+	{
+		country_short: 'MK',
+		region: 'Dolneni',
+		city: 'Desovo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Tetovo',
+		city: 'Tetovo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Kisela Voda',
+		city: 'Usje',
+	},
+	{
+		country_short: 'MK',
+		region: 'Veles',
+		city: 'Veles',
+	},
+	{
+		country_short: 'MK',
+		region: 'Ohrid',
+		city: 'Ohrid',
+	},
+	{
+		country_short: 'KW',
+		region: 'Al Ahmadi',
+		city: 'Al Ahmadi',
+	},
+	{
+		country_short: 'MU',
+		region: 'Port Louis',
+		city: 'Port Louis',
+	},
+	{
+		country_short: 'BG',
+		region: 'Haskovo',
+		city: 'Dimitrovgrad',
+	},
+	{
+		country_short: 'BG',
+		region: 'Targovishte',
+		city: 'Popovo',
+	},
+	{
+		country_short: 'RO',
+		region: 'Brasov',
+		city: 'Brasov',
+	},
+	{
+		country_short: 'RS',
+		region: 'Zajecarski okrug',
+		city: 'Zajecar',
+	},
+	{
+		country_short: 'SI',
+		region: 'Zrece',
+		city: 'Zrece',
+	},
+	{
+		country_short: 'SI',
+		region: 'Pivka',
+		city: 'Pivka',
+	},
+	{
+		country_short: 'SI',
+		region: 'Maribor',
+		city: 'Maribor',
+	},
+	{
+		country_short: 'SI',
+		region: 'Radovljica',
+		city: 'Radovljica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Bled',
+		city: 'Bled',
+	},
+	{
+		country_short: 'SI',
+		region: 'Dobrova-Polhov Gradec',
+		city: 'Podsmreka',
+	},
+	{
+		country_short: 'SI',
+		region: 'Beltinci',
+		city: 'Lipovci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Trzin',
+		city: 'Trzin',
+	},
+	{
+		country_short: 'SI',
+		region: 'Tolmin',
+		city: 'Tolmin',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kungota',
+		city: 'Slatina',
+	},
+	{
+		country_short: 'SI',
+		region: 'Bohinj',
+		city: 'Bohinjska Bistrica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Skofja Loka',
+		city: 'Skofja Loka',
+	},
+	{
+		country_short: 'SI',
+		region: 'Naklo',
+		city: 'Spodnja Besnica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Koper',
+		city: 'Koper',
+	},
+	{
+		country_short: 'SI',
+		region: 'Jesenice',
+		city: 'Koroska Bela',
+	},
+	{
+		country_short: 'SI',
+		region: 'Luce',
+		city: 'Erjavec',
+	},
+	{
+		country_short: 'SI',
+		region: 'Gorje',
+		city: 'Poljsica pri Gorjah',
+	},
+	{
+		country_short: 'SI',
+		region: 'Postojna',
+		city: 'Postojna',
+	},
+	{
+		country_short: 'SI',
+		region: 'Murska Sobota',
+		city: 'Murska Sobota',
+	},
+	{
+		country_short: 'SI',
+		region: 'Trbovlje',
+		city: 'Trbovlje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Logatec',
+		city: 'Logatec',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kocevje',
+		city: 'Kocevje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Lendava',
+		city: 'Lendava',
+	},
+	{
+		country_short: 'SI',
+		region: 'Dobrovnik',
+		city: 'Strehovci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Zalec',
+		city: 'Zalec',
+	},
+	{
+		country_short: 'SI',
+		region: 'Majsperk',
+		city: 'Kupcinji Vrh',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kamnik',
+		city: 'Smarca',
+	},
+	{
+		country_short: 'SI',
+		region: 'Vodice',
+		city: 'Vodice',
+	},
+	{
+		country_short: 'SI',
+		region: 'Mirna Pec',
+		city: 'Orkljevec',
+	},
+	{
+		country_short: 'SI',
+		region: 'Celje',
+		city: 'Celje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Gornji Petrovci',
+		city: 'Gornji Petrovci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Grosuplje',
+		city: 'Grosuplje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kidricevo',
+		city: 'Kidricevo',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kranjska Gora',
+		city: 'Kranjska Gora',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sostanj',
+		city: 'Ravne',
+	},
+	{
+		country_short: 'SI',
+		region: 'Piran',
+		city: 'Lucija',
+	},
+	{
+		country_short: 'SI',
+		region: 'Prebold',
+		city: 'Prebold',
+	},
+	{
+		country_short: 'SI',
+		region: 'Skofljica',
+		city: 'Skofljica',
+	},
+	{
+		country_short: 'AL',
+		region: 'Elbasan',
+		city: 'Elbasan',
+	},
+	{
+		country_short: 'CY',
+		region: 'Lemesos',
+		city: 'Limassol',
+	},
+	{
+		country_short: 'CY',
+		region: 'Larnaka',
+		city: 'Aradippou',
+	},
+	{
+		country_short: 'BY',
+		region: "Vitsyebskaya voblasts'",
+		city: 'Baranovichi',
+	},
+	{
+		country_short: 'BY',
+		region: "Brestskaya voblasts'",
+		city: 'Brest',
+	},
+	{
+		country_short: 'KG',
+		region: 'Ysyk-Kol',
+		city: 'Karakol',
+	},
+	{
+		country_short: 'KG',
+		region: 'Osh Shaary',
+		city: 'Osh',
+	},
+	{
+		country_short: 'KG',
+		region: 'Naryn',
+		city: 'Naryn',
+	},
+	{
+		country_short: 'KG',
+		region: 'Jalal-Abad',
+		city: 'Tash-Kumyr',
+	},
+	{
+		country_short: 'CZ',
+		region: 'Liberecky kraj',
+		city: 'Ceska Lipa',
+	},
+	{
+		country_short: 'MD',
+		region: 'Stinga Nistrului, unitatea teritoriala din',
+		city: 'Stinga Nistrului, unitatea teritoriala din',
+	},
+	{
+		country_short: 'MD',
+		region: 'Bender',
+		city: 'Bender',
+	},
+	{
+		country_short: 'MD',
+		region: 'Criuleni',
+		city: 'Tiraspolul Nou',
+	},
+	{
+		country_short: 'YE',
+		region: 'Ibb',
+		city: 'Dhi as Sufal',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Samarqand',
+		city: 'Samarqand',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Qashqadaryo',
+		city: 'Qarshi',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Buxoro',
+		city: 'Buxoro',
+	},
+	{
+		country_short: 'UA',
+		region: 'Sevastopol',
+		city: 'Sevastopol',
+	},
+	{
+		country_short: 'SM',
+		region: 'Citta di San Marino',
+		city: 'San Marino',
+	},
+	{
+		country_short: 'BG',
+		region: 'Smolyan',
+		city: 'Chepelare',
+	},
+	{
+		country_short: 'RU',
+		region: 'Mordoviya, Respublika',
+		city: 'Mordoviya, Respublika',
+	},
+	{
+		country_short: 'HR',
+		region: 'Medimurska zupanija',
+		city: 'Kotoriba',
+	},
+	{
+		country_short: 'HR',
+		region: 'Sibensko-kninska zupanija',
+		city: 'Rogoznica',
+	},
+	{
+		country_short: 'HR',
+		region: 'Dubrovacko-neretvanska zupanija',
+		city: 'Opuzen',
+	},
+	{
+		country_short: 'AM',
+		region: "Syunik'",
+		city: 'Goris',
+	},
+	{
+		country_short: 'SK',
+		region: 'Banskobystricky kraj',
+		city: 'Krupina',
+	},
+	{
+		country_short: 'RU',
+		region: 'Chechenskaya Respublika',
+		city: 'Pervomayskaya',
+	},
+	{
+		country_short: 'TR',
+		region: 'Ardahan',
+		city: 'Ardahan',
+	},
+	{
+		country_short: 'TR',
+		region: 'Kirklareli',
+		city: 'Luleburgaz',
+	},
+	{
+		country_short: 'CY',
+		region: 'Ammochostos',
+		city: 'Paralimni',
+	},
+	{
+		country_short: 'CY',
+		region: 'Pafos',
+		city: 'Peyia',
+	},
+	{
+		country_short: 'CH',
+		region: 'Glarus',
+		city: 'Netstal',
+	},
+	{
+		country_short: 'CH',
+		region: 'Obwalden',
+		city: 'Engelberg',
+	},
+	{
+		country_short: 'IE',
+		region: 'Donegal',
+		city: 'Ballyshannon',
+	},
+	{
+		country_short: 'IE',
+		region: 'Cavan',
+		city: 'Bailieborough',
+	},
+	{
+		country_short: 'LV',
+		region: 'Kuldigas novads',
+		city: 'Kuldiga',
+	},
+	{
+		country_short: 'LV',
+		region: 'Preilu novads',
+		city: 'Preili',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Qusar',
+		city: 'Samur',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Qazax',
+		city: 'Qazax',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Quba',
+		city: 'Quba',
+	},
+	{
+		country_short: 'LU',
+		region: 'Wiltz',
+		city: 'Wiltz',
+	},
+	{
+		country_short: 'RU',
+		region: "Yevreyskaya avtonomnaya oblast'",
+		city: 'Khingansk',
+	},
+	{
+		country_short: 'RU',
+		region: 'Kalmykiya, Respublika',
+		city: 'Kalmykiya, Respublika',
+	},
+	{
+		country_short: 'IE',
+		region: 'Leitrim',
+		city: 'Drumshanbo',
+	},
+	{
+		country_short: 'IE',
+		region: 'Carlow',
+		city: 'Carlow',
+	},
+	{
+		country_short: 'IE',
+		region: 'Offaly',
+		city: 'Edenderry',
+	},
+	{
+		country_short: 'IE',
+		region: 'Wexford',
+		city: 'Ferns',
+	},
+	{
+		country_short: 'KW',
+		region: 'Al Farwaniyah',
+		city: 'Ar Rabiyah',
+	},
+	{
+		country_short: 'KW',
+		region: "Al Jahra'",
+		city: "Al Jahra'",
+	},
+	{
+		country_short: 'KW',
+		region: 'Mubarak al Kabir',
+		city: 'Sabah as Salim',
+	},
+	{
+		country_short: 'ME',
+		region: 'Podgorica',
+		city: 'Podgorica',
+	},
+	{
+		country_short: 'ME',
+		region: 'Berane',
+		city: 'Berane',
+	},
+	{
+		country_short: 'ME',
+		region: 'Ulcinj',
+		city: 'Ulcinj',
+	},
+	{
+		country_short: 'ME',
+		region: 'Bar',
+		city: 'Sutomore',
+	},
+	{
+		country_short: 'ME',
+		region: 'Herceg-Novi',
+		city: 'Herceg-Novi',
+	},
+	{
+		country_short: 'LT',
+		region: 'Panevezio apskritis',
+		city: 'Panevezys',
+	},
+	{
+		country_short: 'CD',
+		region: 'Tshopo',
+		city: 'Kisangani',
+	},
+	{
+		country_short: 'IS',
+		region: 'Nordurland eystra',
+		city: 'Akureyri',
+	},
+	{
+		country_short: 'IS',
+		region: 'Nordurland vestra',
+		city: 'Saudarkrokur',
+	},
+	{
+		country_short: 'IE',
+		region: 'Kilkenny',
+		city: 'Kilkenny',
+	},
+	{
+		country_short: 'CH',
+		region: 'Jura',
+		city: 'Alle',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Diyala',
+		city: 'Baqubah',
+	},
+	{
+		country_short: 'SV',
+		region: 'San Salvador',
+		city: 'Aguilares',
+	},
+	{
+		country_short: 'SV',
+		region: 'Morazan',
+		city: 'San Francisco',
+	},
+	{
+		country_short: 'SV',
+		region: 'Chalatenango',
+		city: 'Chalatenango',
+	},
+	{
+		country_short: 'SV',
+		region: 'Cuscatlan',
+		city: 'Cojutepeque',
+	},
+	{
+		country_short: 'SV',
+		region: 'Usulutan',
+		city: 'Usulutan',
+	},
+	{
+		country_short: 'SV',
+		region: 'Santa Ana',
+		city: 'Santa Ana',
+	},
+	{
+		country_short: 'PA',
+		region: 'Chiriqui',
+		city: 'Boqueron',
+	},
+	{
+		country_short: 'SV',
+		region: 'Cabanas',
+		city: 'Sensuntepeque',
+	},
+	{
+		country_short: 'SV',
+		region: 'Ahuachapan',
+		city: 'Ahuachapan',
+	},
+	{
+		country_short: 'SV',
+		region: 'San Miguel',
+		city: 'Moncagua',
+	},
+	{
+		country_short: 'SV',
+		region: 'La Union',
+		city: 'La Union',
+	},
+	{
+		country_short: 'SV',
+		region: 'La Libertad',
+		city: 'Lourdes',
+	},
+	{
+		country_short: 'CL',
+		region: 'Valparaiso',
+		city: 'Valparaiso',
+	},
+	{
+		country_short: 'CL',
+		region: 'Biobio',
+		city: 'Concepcion',
+	},
+	{
+		country_short: 'MX',
+		region: 'Chihuahua',
+		city: 'Ciudad Juarez',
+	},
+	{
+		country_short: 'MX',
+		region: 'Durango',
+		city: 'Juarez',
+	},
+	{
+		country_short: 'MX',
+		region: 'Guanajuato',
+		city: 'Silao',
+	},
+	{
+		country_short: 'MX',
+		region: 'Coahuila de Zaragoza',
+		city: 'Torreon',
+	},
+	{
+		country_short: 'MX',
+		region: 'Puebla',
+		city: 'Huejotzingo',
+	},
+	{
+		country_short: 'AR',
+		region: 'Mendoza',
+		city: 'San Martin',
+	},
+	{
+		country_short: 'AR',
+		region: 'San Luis',
+		city: 'San Luis',
+	},
+	{
+		country_short: 'BR',
+		region: 'Para',
+		city: 'Campo',
+	},
+	{
+		country_short: 'CL',
+		region: 'Antofagasta',
+		city: 'Antofagasta',
+	},
+	{
+		country_short: 'CL',
+		region: 'Tarapaca',
+		city: 'Iquique',
+	},
+	{
+		country_short: 'MX',
+		region: 'San Luis Potosi',
+		city: 'San Luis Potosi',
+	},
+	{
+		country_short: 'MX',
+		region: 'Tlaxcala',
+		city: 'Tlaxcala',
+	},
+	{
+		country_short: 'MX',
+		region: 'Hidalgo',
+		city: 'Pachuca de Soto',
+	},
+	{
+		country_short: 'PA',
+		region: 'Herrera',
+		city: 'Pese',
+	},
+	{
+		country_short: 'PA',
+		region: 'Ngobe-Bugle',
+		city: 'Santos',
+	},
+	{
+		country_short: 'PA',
+		region: 'Veraguas',
+		city: 'San Francisco',
+	},
+	{
+		country_short: 'PA',
+		region: 'Colon',
+		city: 'Colon',
+	},
+	{
+		country_short: 'SV',
+		region: 'La Paz',
+		city: 'San Luis Talpa',
+	},
+	{
+		country_short: 'CR',
+		region: 'Heredia',
+		city: 'Heredia',
+	},
+	{
+		country_short: 'CR',
+		region: 'Cartago',
+		city: 'Cartago',
+	},
+	{
+		country_short: 'DO',
+		region: 'Peravia',
+		city: 'Matanzas',
+	},
+	{
+		country_short: 'MX',
+		region: 'Veracruz de Ignacio de la Llave',
+		city: 'Nogales',
+	},
+	{
+		country_short: 'FI',
+		region: 'Etela-Karjala',
+		city: 'Lappeenranta',
+	},
+	{
+		country_short: 'AD',
+		region: 'Andorra la Vella',
+		city: 'Andorra la Vella',
+	},
+	{
+		country_short: 'MC',
+		region: 'Monaco-Ville',
+		city: 'Monaco',
+	},
+	{
+		country_short: 'BO',
+		region: 'Santa Cruz',
+		city: 'Santa Cruz de la Sierra',
+	},
+	{
+		country_short: 'ID',
+		region: 'Kalimantan Timur',
+		city: 'Balikpapan',
+	},
+	{
+		country_short: 'ID',
+		region: 'Kalimantan Barat',
+		city: 'Pontianak',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sulawesi Tengah',
+		city: 'Tolitoli',
+	},
+	{
+		country_short: 'ID',
+		region: 'Jawa Tengah',
+		city: 'Boyolali',
+	},
+	{
+		country_short: 'KH',
+		region: 'Siem Reab',
+		city: 'Siem Reap',
+	},
+	{
+		country_short: 'KH',
+		region: 'Stueng Traeng',
+		city: 'Stung Treng',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kampong Chaam',
+		city: 'Kampong Cham',
+	},
+	{
+		country_short: 'KH',
+		region: 'Prey Veaeng',
+		city: 'Prey Veng',
+	},
+	{
+		country_short: 'KH',
+		region: 'Preah Sihanouk',
+		city: 'Sihanoukville',
+	},
+	{
+		country_short: 'KH',
+		region: 'Baat Dambang',
+		city: 'Battambang',
+	},
+	{
+		country_short: 'KH',
+		region: 'Taakaev',
+		city: 'Phumi Veal Sre',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kaeb',
+		city: 'Krong Kep',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kampong Thum',
+		city: 'Kampong Thom',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kampot',
+		city: 'Kampot',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kracheh',
+		city: 'Kratie',
+	},
+	{
+		country_short: 'KH',
+		region: 'Preah Vihear',
+		city: 'Tbeng Meanchey',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kandaal',
+		city: 'Ta Khmau',
+	},
+	{
+		country_short: 'KH',
+		region: 'Pousaat',
+		city: 'Pursat',
+	},
+	{
+		country_short: 'KH',
+		region: 'Mondol Kiri',
+		city: 'Senmonourom',
+	},
+	{
+		country_short: 'KH',
+		region: 'Svaay Rieng',
+		city: 'Bavet',
+	},
+	{
+		country_short: 'CN',
+		region: 'Jilin',
+		city: 'Changchun',
+	},
+	{
+		country_short: 'ID',
+		region: 'Kepulauan Bangka Belitung',
+		city: 'Pangkalpinang',
+	},
+	{
+		country_short: 'ID',
+		region: 'Lampung',
+		city: 'Bandarlampung',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sumatera Selatan',
+		city: 'Palembang',
+	},
+	{
+		country_short: 'ID',
+		region: 'Jambi',
+		city: 'Jambi',
+	},
+	{
+		country_short: 'ID',
+		region: 'Yogyakarta',
+		city: 'Yogyakarta',
+	},
+	{
+		country_short: 'ID',
+		region: 'Nusa Tenggara Barat',
+		city: 'Mataram',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sumatera Barat',
+		city: 'Padang',
+	},
+	{
+		country_short: 'ID',
+		region: 'Kalimantan Utara',
+		city: 'Tarakan',
+	},
+	{
+		country_short: 'ID',
+		region: 'Kalimantan Tengah',
+		city: 'Palangkaraya',
+	},
+	{
+		country_short: 'ID',
+		region: 'Papua',
+		city: 'Nabire',
+	},
+	{
+		country_short: 'ID',
+		region: 'Maluku',
+		city: 'Passo',
+	},
+	{
+		country_short: 'ID',
+		region: 'Gorontalo',
+		city: 'Isimu',
+	},
+	{
+		country_short: 'ID',
+		region: 'Aceh',
+		city: 'Lhokseumawe',
+	},
+	{
+		country_short: 'ID',
+		region: 'Maluku Utara',
+		city: 'Ternate',
+	},
+	{
+		country_short: 'ID',
+		region: 'Papua Barat',
+		city: 'Manokwari',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sulawesi Tenggara',
+		city: 'Unaaha',
+	},
+	{
+		country_short: 'ID',
+		region: 'Nusa Tenggara Timur',
+		city: 'Ende',
+	},
+	{
+		country_short: 'ID',
+		region: 'Bengkulu',
+		city: 'Bengkulu',
+	},
+	{
+		country_short: 'ID',
+		region: 'Sulawesi Barat',
+		city: 'Mamasa',
+	},
+	{
+		country_short: 'CN',
+		region: 'Xinjiang Uygur',
+		city: 'Altay',
+	},
+	{
+		country_short: 'CN',
+		region: 'Qinghai',
+		city: 'Xining',
+	},
+	{
+		country_short: 'PK',
+		region: 'Khyber Pakhtunkhwa',
+		city: 'Peshawar',
+	},
+	{
+		country_short: 'PH',
+		region: 'Davao de Oro',
+		city: 'San-Miguel',
+	},
+	{
+		country_short: 'PH',
+		region: 'Davao del Norte',
+		city: 'Cabili',
+	},
+	{
+		country_short: 'ME',
+		region: 'Kotor',
+		city: 'Kotor',
+	},
+	{
+		country_short: 'FI',
+		region: 'Satakunta',
+		city: 'Rauma',
+	},
+	{
+		country_short: 'BY',
+		region: "Homyel'skaya voblasts'",
+		city: "Homyel'",
+	},
+	{
+		country_short: 'JO',
+		region: "Al Balqa'",
+		city: 'As Salt',
+	},
+	{
+		country_short: 'GE',
+		region: 'Abkhazia',
+		city: 'Sokhumi',
+	},
+	{
+		country_short: 'GL',
+		region: 'Kommuneqarfik Sermersooq',
+		city: 'Nuuk',
+	},
+	{
+		country_short: 'GL',
+		region: 'Qeqqata Kommunia',
+		city: 'Maniitsoq',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Salyan',
+		city: 'Salyan',
+	},
+	{
+		country_short: 'SI',
+		region: 'Divaca',
+		city: 'Divaca',
+	},
+	{
+		country_short: 'SI',
+		region: 'Izola',
+		city: 'Izola',
+	},
+	{
+		country_short: 'BE',
+		region: 'Liege',
+		city: 'Liege',
+	},
+	{
+		country_short: 'RS',
+		region: 'Pcinjski okrug',
+		city: 'Vranje',
+	},
+	{
+		country_short: 'RS',
+		region: 'Toplicki okrug',
+		city: 'Sokolovica',
+	},
+	{
+		country_short: 'NG',
+		region: 'Abuja Federal Capital Territory',
+		city: 'Abuja',
+	},
+	{
+		country_short: 'AL',
+		region: 'Vlore',
+		city: 'Vlore',
+	},
+	{
+		country_short: 'AL',
+		region: 'Durres',
+		city: 'Durres',
+	},
+	{
+		country_short: 'AL',
+		region: 'Lezhe',
+		city: 'Kurbnesh',
+	},
+	{
+		country_short: 'MK',
+		region: 'Kavadarci',
+		city: 'Kavadarci',
+	},
+	{
+		country_short: 'MD',
+		region: 'Anenii Noi',
+		city: 'Varnita',
+	},
+	{
+		country_short: 'RU',
+		region: 'Kareliya, Respublika',
+		city: 'Kareliya, Respublika',
+	},
+	{
+		country_short: 'PT',
+		region: 'Regiao Autonoma da Madeira',
+		city: 'Funchal',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Naxcivan',
+		city: 'Demirchi',
+	},
+	{
+		country_short: 'FI',
+		region: 'Etela-Savo',
+		city: 'Mikkeli',
+	},
+	{
+		country_short: 'FI',
+		region: 'Paijat-Hame',
+		city: 'Sysma',
+	},
+	{
+		country_short: 'FI',
+		region: 'Pohjois-Pohjanmaa',
+		city: 'Oulu',
+	},
+	{
+		country_short: 'FI',
+		region: 'Lappi',
+		city: 'Kemi',
+	},
+	{
+		country_short: 'FI',
+		region: 'Kainuu',
+		city: 'Kajaani',
+	},
+	{
+		country_short: 'FI',
+		region: 'Pohjois-Karjala',
+		city: 'Tuupovaara',
+	},
+	{
+		country_short: 'MD',
+		region: 'Ialoveni',
+		city: 'Cigirleni',
+	},
+	{
+		country_short: 'RS',
+		region: 'Severnobacki okrug',
+		city: 'Subotica',
+	},
+	{
+		country_short: 'IE',
+		region: 'Waterford',
+		city: 'Passage East',
+	},
+	{
+		country_short: 'BZ',
+		region: 'Cayo',
+		city: 'Belmopan',
+	},
+	{
+		country_short: 'SK',
+		region: 'Trenciansky kraj',
+		city: 'Nove Mesto nad Vahom',
+	},
+	{
+		country_short: 'BG',
+		region: 'Burgas',
+		city: 'Burgas',
+	},
+	{
+		country_short: 'AT',
+		region: 'Tirol',
+		city: 'Telfs',
+	},
+	{
+		country_short: 'BG',
+		region: 'Pernik',
+		city: 'Pernik',
+	},
+	{
+		country_short: 'MD',
+		region: 'Floresti',
+		city: 'Floresti',
+	},
+	{
+		country_short: 'MT',
+		region: 'Sliema',
+		city: 'Sliema',
+	},
+	{
+		country_short: 'MT',
+		region: 'Saint Lawrence',
+		city: 'Dwejra',
+	},
+	{
+		country_short: 'MT',
+		region: 'Bormla',
+		city: 'Cospicua',
+	},
+	{
+		country_short: 'MT',
+		region: 'Pieta',
+		city: 'Gwardamanga',
+	},
+	{
+		country_short: 'MT',
+		region: 'Attard',
+		city: 'Attard',
+	},
+	{
+		country_short: 'MT',
+		region: 'Dingli',
+		city: 'Dingli',
+	},
+	{
+		country_short: 'MT',
+		region: 'Mosta',
+		city: 'Mosta',
+	},
+	{
+		country_short: 'MT',
+		region: 'Qormi',
+		city: 'Qormi',
+	},
+	{
+		country_short: 'MT',
+		region: 'Saint John',
+		city: 'Saint John',
+	},
+	{
+		country_short: 'MT',
+		region: 'Mdina',
+		city: 'Imdina',
+	},
+	{
+		country_short: 'MT',
+		region: 'Zabbar',
+		city: 'Zabbar',
+	},
+	{
+		country_short: 'MT',
+		region: 'Birzebbuga',
+		city: 'Birzebbuga',
+	},
+	{
+		country_short: 'MT',
+		region: 'Lija',
+		city: 'Lija',
+	},
+	{
+		country_short: 'MT',
+		region: 'Zebbug Gozo',
+		city: 'Zebbug',
+	},
+	{
+		country_short: 'MT',
+		region: 'Msida',
+		city: 'Msida',
+	},
+	{
+		country_short: 'MT',
+		region: "Saint Paul's Bay",
+		city: 'San Pawl il-Bahar',
+	},
+	{
+		country_short: 'MT',
+		region: 'Mgarr',
+		city: 'Ghajn Tuffieha',
+	},
+	{
+		country_short: 'MT',
+		region: 'Swieqi',
+		city: 'Swieqi',
+	},
+	{
+		country_short: 'MD',
+		region: 'Hincesti',
+		city: 'Horjesti',
+	},
+	{
+		country_short: 'MD',
+		region: 'Straseni',
+		city: 'Straseni',
+	},
+	{
+		country_short: 'MD',
+		region: 'Briceni',
+		city: 'Briceni',
+	},
+	{
+		country_short: 'MD',
+		region: 'Cantemir',
+		city: 'Visniovca',
+	},
+	{
+		country_short: 'MD',
+		region: 'Taraclia',
+		city: 'Valea Perjei',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Al Basrah',
+		city: 'Basrah',
+	},
+	{
+		country_short: 'TJ',
+		region: 'Dushanbe',
+		city: 'Dushanbe',
+	},
+	{
+		country_short: 'TJ',
+		region: 'Sughd',
+		city: 'Chkalovsk',
+	},
+	{
+		country_short: 'CH',
+		region: 'Appenzell Innerrhoden',
+		city: 'Appenzell',
+	},
+	{
+		country_short: 'UZ',
+		region: "Farg'ona",
+		city: 'Toshloq',
+	},
+	{
+		country_short: 'MM',
+		region: 'Kayah',
+		city: 'Loikaw',
+	},
+	{
+		country_short: 'MM',
+		region: 'Mandalay',
+		city: 'Mandalay',
+	},
+	{
+		country_short: 'MM',
+		region: 'Shan',
+		city: 'Myothit',
+	},
+	{
+		country_short: 'MM',
+		region: 'Sagaing',
+		city: 'Shwebo',
+	},
+	{
+		country_short: 'MM',
+		region: 'Ayeyarwady',
+		city: 'Kyaiklat',
+	},
+	{
+		country_short: 'MM',
+		region: 'Bago',
+		city: 'Nyaunglebin',
+	},
+	{
+		country_short: 'MM',
+		region: 'Kachin',
+		city: 'Myitkyina',
+	},
+	{
+		country_short: 'PK',
+		region: 'Islamabad',
+		city: 'Islamabad',
+	},
+	{
+		country_short: 'PK',
+		region: 'Balochistan',
+		city: 'Gwadar',
+	},
+	{
+		country_short: 'FO',
+		region: 'Streymoy',
+		city: 'Torshavn',
+	},
+	{
+		country_short: 'ME',
+		region: 'Bijelo Polje',
+		city: 'Bijelo Polje',
+	},
+	{
+		country_short: 'ME',
+		region: 'Tivat',
+		city: 'Tivat',
+	},
+	{
+		country_short: 'ME',
+		region: 'Budva',
+		city: 'Budva',
+	},
+	{
+		country_short: 'ME',
+		region: 'Rozaje',
+		city: 'Rozaje',
+	},
+	{
+		country_short: 'ME',
+		region: 'Plav',
+		city: 'Skic',
+	},
+	{
+		country_short: 'ME',
+		region: 'Kolasin',
+		city: 'Kolasin',
+	},
+	{
+		country_short: 'JO',
+		region: "Al 'Aqabah",
+		city: 'Aqaba',
+	},
+	{
+		country_short: 'BG',
+		region: 'Dobrich',
+		city: 'Dobrich',
+	},
+	{
+		country_short: 'BH',
+		region: 'Al Janubiyah',
+		city: 'Jaww',
+	},
+	{
+		country_short: 'BH',
+		region: 'Ash Shamaliyah',
+		city: "Madinat 'Isa",
+	},
+	{
+		country_short: 'EE',
+		region: 'Tartumaa',
+		city: 'Laeva',
+	},
+	{
+		country_short: 'EE',
+		region: 'Viljandimaa',
+		city: 'Mustla',
+	},
+	{
+		country_short: 'EE',
+		region: 'Parnumaa',
+		city: 'Parnu',
+	},
+	{
+		country_short: 'EE',
+		region: 'Laanemaa',
+		city: 'Haapsalu',
+	},
+	{
+		country_short: 'EE',
+		region: 'Jogevamaa',
+		city: 'Poltsamaa',
+	},
+	{
+		country_short: 'BG',
+		region: 'Vratsa',
+		city: 'Kozloduy',
+	},
+	{
+		country_short: 'BG',
+		region: 'Yambol',
+		city: 'Yambol',
+	},
+	{
+		country_short: 'QA',
+		region: 'Al Wakrah',
+		city: 'Al Wukayr',
+	},
+	{
+		country_short: 'QA',
+		region: 'Ash Shamal',
+		city: "Ar Ru'ays",
+	},
+	{
+		country_short: 'JO',
+		region: 'Al Karak',
+		city: "'Izra",
+	},
+	{
+		country_short: 'JO',
+		region: 'Jarash',
+		city: "Ar Rujm al 'Ali",
+	},
+	{
+		country_short: 'JO',
+		region: 'Al Mafraq',
+		city: 'Mafraq',
+	},
+	{
+		country_short: 'JO',
+		region: "'Ajlun",
+		city: 'Mintaqat al Hawuz',
+	},
+	{
+		country_short: 'JO',
+		region: 'Madaba',
+		city: 'Madaba',
+	},
+	{
+		country_short: 'QA',
+		region: 'Al Khawr wa adh Dhakhirah',
+		city: 'Al Khawr',
+	},
+	{
+		country_short: 'QA',
+		region: "Az Za'ayin",
+		city: "Az Za'ayin",
+	},
+	{
+		country_short: 'KG',
+		region: 'Talas',
+		city: 'Kyzyl-Adyr',
+	},
+	{
+		country_short: 'SC',
+		region: 'Beau Vallon',
+		city: 'Beau Vallon',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kranj',
+		city: 'Kranj',
+	},
+	{
+		country_short: 'GL',
+		region: 'Avannaata Kommunia',
+		city: 'Ilulissat',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Salah ad Din',
+		city: 'Ad Dujayl',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Al Qadisiyah',
+		city: "'Afak",
+	},
+	{
+		country_short: 'IQ',
+		region: 'Al Muthanna',
+		city: 'As Samawah',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Dhi Qar',
+		city: 'Ash Shatrah',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Al Anbar',
+		city: 'Hit',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Maysan',
+		city: 'Al Majar al Kabir',
+	},
+	{
+		country_short: 'IQ',
+		region: 'Dahuk',
+		city: 'Dahuk',
+	},
+	{
+		country_short: 'AL',
+		region: 'Diber',
+		city: 'Peshkopi',
+	},
+	{
+		country_short: 'VE',
+		region: 'Zulia',
+		city: 'Maracaibo',
+	},
+	{
+		country_short: 'AR',
+		region: 'Chaco',
+		city: 'San Bernardo',
+	},
+	{
+		country_short: 'MX',
+		region: 'Michoacan de Ocampo',
+		city: 'Tancitaro',
+	},
+	{
+		country_short: 'DO',
+		region: 'Maria Trinidad Sanchez',
+		city: 'Nagua',
+	},
+	{
+		country_short: 'DO',
+		region: 'Espaillat',
+		city: 'Rio San Juan',
+	},
+	{
+		country_short: 'DO',
+		region: 'Valverde',
+		city: 'Esperanza',
+	},
+	{
+		country_short: 'DO',
+		region: 'Puerto Plata',
+		city: 'Sosua',
+	},
+	{
+		country_short: 'BR',
+		region: 'Mato Grosso do Sul',
+		city: 'Jardim',
+	},
+	{
+		country_short: 'VE',
+		region: 'Falcon',
+		city: 'Punto Fijo',
+	},
+	{
+		country_short: 'VE',
+		region: 'Aragua',
+		city: 'Maracay',
+	},
+	{
+		country_short: 'MX',
+		region: 'Guerrero',
+		city: 'Cuautepec',
+	},
+	{
+		country_short: 'BR',
+		region: 'Amapa',
+		city: 'Macapa',
+	},
+	{
+		country_short: 'AR',
+		region: 'San Juan',
+		city: 'Chimbas',
+	},
+	{
+		country_short: 'AR',
+		region: 'Chubut',
+		city: 'Comodoro Rivadavia',
+	},
+	{
+		country_short: 'DO',
+		region: 'Monte Plata',
+		city: 'Esperalvillo',
+	},
+	{
+		country_short: 'VE',
+		region: 'La Guaira',
+		city: 'Maiquetia',
+	},
+	{
+		country_short: 'VE',
+		region: 'Lara',
+		city: 'Guayana',
+	},
+	{
+		country_short: 'VE',
+		region: 'Bolivar',
+		city: 'Ciudad Guayana',
+	},
+	{
+		country_short: 'VE',
+		region: 'Anzoategui',
+		city: 'El Tigre',
+	},
+	{
+		country_short: 'DO',
+		region: 'San Pedro de Macoris',
+		city: 'Los Llanos',
+	},
+	{
+		country_short: 'DO',
+		region: 'Samana',
+		city: 'Samana',
+	},
+	{
+		country_short: 'AR',
+		region: 'Santiago del Estero',
+		city: 'Santiago del Estero',
+	},
+	{
+		country_short: 'VE',
+		region: 'Carabobo',
+		city: 'Valencia',
+	},
+	{
+		country_short: 'MX',
+		region: 'Aguascalientes',
+		city: 'Calvillo',
+	},
+	{
+		country_short: 'VE',
+		region: 'Nueva Esparta',
+		city: 'Porlamar',
+	},
+	{
+		country_short: 'AR',
+		region: 'La Rioja',
+		city: 'La Rioja',
+	},
+	{
+		country_short: 'DO',
+		region: 'Monsenor Nouel',
+		city: 'Bonao',
+	},
+	{
+		country_short: 'BR',
+		region: 'Paraiba',
+		city: 'Santa Luzia',
+	},
+	{
+		country_short: 'MX',
+		region: 'Chiapas',
+		city: 'Reforma',
+	},
+	{
+		country_short: 'MX',
+		region: 'Tabasco',
+		city: 'Villahermosa',
+	},
+	{
+		country_short: 'DO',
+		region: 'San Cristobal',
+		city: 'Villa Altagracia',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Mpumalanga',
+		city: 'White River',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Free State',
+		city: 'Sasolburg',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Northern Cape',
+		city: 'Kathu',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Eastern Cape',
+		city: 'Port Elizabeth',
+	},
+	{
+		country_short: 'ZA',
+		region: 'Limpopo',
+		city: 'Polokwane',
+	},
+	{
+		country_short: 'ZA',
+		region: 'North-West',
+		city: 'Photsaneng',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Jizah',
+		city: 'Giza',
+	},
+	{
+		country_short: 'EG',
+		region: 'Ash Sharqiyah',
+		city: 'Bilbays',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Qalyubiyah',
+		city: 'Al Khankah',
+	},
+	{
+		country_short: 'EG',
+		region: "Janub Sina'",
+		city: 'Sharm el-Sheikh',
+	},
+	{
+		country_short: 'EG',
+		region: "Bur Sa'id",
+		city: 'Port Said',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Gharbiyah',
+		city: 'Al Mahallah al Kubra',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Buhayrah',
+		city: 'Damanhur',
+	},
+	{
+		country_short: 'EG',
+		region: 'Dumyat',
+		city: 'Damietta',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Bahr al Ahmar',
+		city: 'Hurghada',
+	},
+	{
+		country_short: 'EG',
+		region: 'Matruh',
+		city: "Al 'Alamayn",
+	},
+	{
+		country_short: 'EG',
+		region: 'As Suways',
+		city: 'Ain Sukhna',
+	},
+	{
+		country_short: 'EG',
+		region: 'Aswan',
+		city: 'Aswan',
+	},
+	{
+		country_short: 'EG',
+		region: 'Asyut',
+		city: 'Manfalut',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Minufiyah',
+		city: 'Shibin al Kawm',
+	},
+	{
+		country_short: 'EG',
+		region: "Shamal Sina'",
+		city: 'Arish',
+	},
+	{
+		country_short: 'EG',
+		region: 'Bani Suwayf',
+		city: 'Bani Suwayf',
+	},
+	{
+		country_short: 'EG',
+		region: 'Ad Daqahliyah',
+		city: 'Al Mansurah',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Fayyum',
+		city: 'Ibshaway',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Uqsur',
+		city: 'Luxor',
+	},
+	{
+		country_short: 'EG',
+		region: 'Kafr ash Shaykh',
+		city: 'Fuwwah',
+	},
+	{
+		country_short: 'EG',
+		region: "Al Isma'iliyah",
+		city: 'At Tall al Kabir',
+	},
+	{
+		country_short: 'EG',
+		region: 'Qina',
+		city: 'Farshut',
+	},
+	{
+		country_short: 'EG',
+		region: 'Suhaj',
+		city: 'Jirja',
+	},
+	{
+		country_short: 'LR',
+		region: 'Montserrado',
+		city: 'Monrovia',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kajiado',
+		city: 'Ngong',
+	},
+	{
+		country_short: 'KE',
+		region: 'Nakuru',
+		city: 'Nakuru',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kericho',
+		city: 'Litein',
+	},
+	{
+		country_short: 'NG',
+		region: 'Imo',
+		city: 'Owerri',
+	},
+	{
+		country_short: 'NG',
+		region: 'Niger',
+		city: 'Minna',
+	},
+	{
+		country_short: 'NG',
+		region: 'Ondo',
+		city: 'Ondo',
+	},
+	{
+		country_short: 'NG',
+		region: 'Enugu',
+		city: 'Enugu',
+	},
+	{
+		country_short: 'NG',
+		region: 'Zamfara',
+		city: 'Gusau',
+	},
+	{
+		country_short: 'NG',
+		region: 'Sokoto',
+		city: 'Sokoto',
+	},
+	{
+		country_short: 'NG',
+		region: 'Kwara',
+		city: 'Ilorin',
+	},
+	{
+		country_short: 'NG',
+		region: 'Kaduna',
+		city: 'Kaduna',
+	},
+	{
+		country_short: 'NG',
+		region: 'Osun',
+		city: 'Ogun',
+	},
+	{
+		country_short: 'NG',
+		region: 'Borno',
+		city: 'Maiduguri',
+	},
+	{
+		country_short: 'NG',
+		region: 'Rivers',
+		city: 'Omoku',
+	},
+	{
+		country_short: 'NG',
+		region: 'Delta',
+		city: 'Agbor',
+	},
+	{
+		country_short: 'NG',
+		region: 'Kano',
+		city: 'Kano',
+	},
+	{
+		country_short: 'NG',
+		region: 'Katsina',
+		city: 'Katsina',
+	},
+	{
+		country_short: 'NG',
+		region: 'Kogi',
+		city: 'Ankpa',
+	},
+	{
+		country_short: 'NG',
+		region: 'Nasarawa',
+		city: 'Akwanga',
+	},
+	{
+		country_short: 'NG',
+		region: 'Cross River',
+		city: 'Calabar',
+	},
+	{
+		country_short: 'NG',
+		region: 'Anambra',
+		city: 'Nnewi',
+	},
+	{
+		country_short: 'NG',
+		region: 'Plateau',
+		city: 'Pankshin',
+	},
+	{
+		country_short: 'NG',
+		region: 'Gombe',
+		city: 'Gombe',
+	},
+	{
+		country_short: 'NG',
+		region: 'Yobe',
+		city: 'Potiskum',
+	},
+	{
+		country_short: 'NG',
+		region: 'Adamawa',
+		city: 'Yola',
+	},
+	{
+		country_short: 'NG',
+		region: 'Abia',
+		city: 'Arochukwu',
+	},
+	{
+		country_short: 'NG',
+		region: 'Edo',
+		city: 'Ekpoma',
+	},
+	{
+		country_short: 'NG',
+		region: 'Jigawa',
+		city: 'Gumel',
+	},
+	{
+		country_short: 'NG',
+		region: 'Oyo',
+		city: 'Ibadan',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Lusaka',
+		city: 'Lusaka',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Southern',
+		city: 'Livingstone',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Luapula',
+		city: 'Kawambwa',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Central',
+		city: 'Kabwe',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Matabeleland South',
+		city: 'Beitbridge',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Mashonaland East',
+		city: 'Mount Hampden',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Matabeleland North',
+		city: 'Victoria Falls',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Bulawayo',
+		city: 'Bulawayo',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Copperbelt',
+		city: 'Kitwe',
+	},
+	{
+		country_short: 'BW',
+		region: 'South East',
+		city: 'Gaborone',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Muchinga',
+		city: 'Mpika',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Nampula',
+		city: 'Mozambique',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kiambu',
+		city: 'Kiambu',
+	},
+	{
+		country_short: 'KE',
+		region: 'Homa Bay',
+		city: 'Oyugis',
+	},
+	{
+		country_short: 'TN',
+		region: 'Bizerte',
+		city: 'Mateur',
+	},
+	{
+		country_short: 'TN',
+		region: 'Mahdia',
+		city: 'El Jem',
+	},
+	{
+		country_short: 'TN',
+		region: 'Sfax',
+		city: 'Sfax',
+	},
+	{
+		country_short: 'TN',
+		region: 'Tunis',
+		city: 'Tunis',
+	},
+	{
+		country_short: 'TN',
+		region: 'Gafsa',
+		city: 'Ar Rudayyif',
+	},
+	{
+		country_short: 'TN',
+		region: 'Sousse',
+		city: 'Sousse',
+	},
+	{
+		country_short: 'TN',
+		region: 'Beja',
+		city: 'Bardo',
+	},
+	{
+		country_short: 'TN',
+		region: 'Nabeul',
+		city: 'Manzil Bu Zalafah',
+	},
+	{
+		country_short: 'TN',
+		region: 'Medenine',
+		city: 'Zarzis',
+	},
+	{
+		country_short: 'TN',
+		region: 'Kairouan',
+		city: 'Kairouan',
+	},
+	{
+		country_short: 'TN',
+		region: 'Monastir',
+		city: 'Monastir',
+	},
+	{
+		country_short: 'TN',
+		region: "L'Ariana",
+		city: 'Ariana',
+	},
+	{
+		country_short: 'TN',
+		region: 'La Manouba',
+		city: 'Manouba',
+	},
+	{
+		country_short: 'TN',
+		region: 'Gabes',
+		city: 'Gabes',
+	},
+	{
+		country_short: 'TN',
+		region: 'Jendouba',
+		city: 'Wadi Maliz',
+	},
+	{
+		country_short: 'TN',
+		region: 'Ben Arous',
+		city: 'Ben Arous',
+	},
+	{
+		country_short: 'TN',
+		region: 'Tozeur',
+		city: 'Nefta',
+	},
+	{
+		country_short: 'TN',
+		region: 'Kebili',
+		city: 'Bechri',
+	},
+	{
+		country_short: 'TN',
+		region: 'Sidi Bouzid',
+		city: 'Sidi Bouzid',
+	},
+	{
+		country_short: 'TN',
+		region: 'Zaghouan',
+		city: 'El Fahs',
+	},
+	{
+		country_short: 'TN',
+		region: 'Tataouine',
+		city: 'Tataouine',
+	},
+	{
+		country_short: 'TN',
+		region: 'Siliana',
+		city: 'Siliana',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Western',
+		city: 'Mukuba',
+	},
+	{
+		country_short: 'MG',
+		region: 'Antananarivo',
+		city: 'Antananarivo',
+	},
+	{
+		country_short: 'MG',
+		region: 'Toliara',
+		city: 'Belo Tsiribihina',
+	},
+	{
+		country_short: 'MG',
+		region: 'Mahajanga',
+		city: 'Mahajanga',
+	},
+	{
+		country_short: 'AO',
+		region: 'Luanda',
+		city: 'Luanda',
+	},
+	{
+		country_short: 'AO',
+		region: 'Malange',
+		city: 'Malanje',
+	},
+	{
+		country_short: 'AO',
+		region: 'Bie',
+		city: 'Kuito',
+	},
+	{
+		country_short: 'AO',
+		region: 'Benguela',
+		city: 'Benguela',
+	},
+	{
+		country_short: 'NA',
+		region: 'Khomas',
+		city: 'Windhoek',
+	},
+	{
+		country_short: 'NA',
+		region: 'Oshikoto',
+		city: 'Tsumeb',
+	},
+	{
+		country_short: 'NA',
+		region: 'Erongo',
+		city: 'Walvis Bay',
+	},
+	{
+		country_short: 'NA',
+		region: 'Kunene',
+		city: 'Khorixas',
+	},
+	{
+		country_short: 'NA',
+		region: 'Hardap',
+		city: 'Aranos',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Minya',
+		city: 'Bani Mazar',
+	},
+	{
+		country_short: 'CI',
+		region: 'Abidjan',
+		city: 'Abidjan',
+	},
+	{
+		country_short: 'CI',
+		region: 'Comoe',
+		city: 'Aboisso',
+	},
+	{
+		country_short: 'CI',
+		region: 'Yamoussoukro',
+		city: 'Nzuessi',
+	},
+	{
+		country_short: 'CI',
+		region: 'Lagunes',
+		city: 'Adzope',
+	},
+	{
+		country_short: 'CI',
+		region: 'Savanes',
+		city: 'Korhogo',
+	},
+	{
+		country_short: 'GH',
+		region: 'Ashanti',
+		city: 'Kumasi',
+	},
+	{
+		country_short: 'GH',
+		region: 'Eastern',
+		city: 'Koforidua',
+	},
+	{
+		country_short: 'GH',
+		region: 'Upper East',
+		city: 'Navrongo',
+	},
+	{
+		country_short: 'GH',
+		region: 'Upper West',
+		city: 'Jirapa',
+	},
+	{
+		country_short: 'GH',
+		region: 'Western',
+		city: 'Takoradi',
+	},
+	{
+		country_short: 'GH',
+		region: 'Northern',
+		city: 'Tamale',
+	},
+	{
+		country_short: 'GH',
+		region: 'Bono',
+		city: 'Sunyani',
+	},
+	{
+		country_short: 'SD',
+		region: 'Khartoum',
+		city: 'Khartoum',
+	},
+	{
+		country_short: 'SD',
+		region: 'Kassala',
+		city: 'Kassala',
+	},
+	{
+		country_short: 'SD',
+		region: 'Blue Nile',
+		city: 'Ad-Damazin',
+	},
+	{
+		country_short: 'SD',
+		region: 'Gezira',
+		city: 'Wad Medani',
+	},
+	{
+		country_short: 'SD',
+		region: 'South Darfur',
+		city: 'Nyala',
+	},
+	{
+		country_short: 'SD',
+		region: 'Northern',
+		city: 'Dongola',
+	},
+	{
+		country_short: 'CI',
+		region: 'Vallee du Bandama',
+		city: 'Katiola',
+	},
+	{
+		country_short: 'CI',
+		region: 'Bas-Sassandra',
+		city: 'San-Pedro',
+	},
+	{
+		country_short: 'CI',
+		region: 'Woroba',
+		city: 'Seguela',
+	},
+	{
+		country_short: 'CI',
+		region: 'Lacs',
+		city: 'Dimbokro',
+	},
+	{
+		country_short: 'CI',
+		region: 'Sassandra-Marahoue',
+		city: 'Vavoua',
+	},
+	{
+		country_short: 'CI',
+		region: 'Montagnes',
+		city: 'Danane',
+	},
+	{
+		country_short: 'NG',
+		region: 'Ogun',
+		city: 'Agbara',
+	},
+	{
+		country_short: 'NG',
+		region: 'Akwa Ibom',
+		city: 'Eket',
+	},
+	{
+		country_short: 'MW',
+		region: 'Zomba',
+		city: 'Zomba',
+	},
+	{
+		country_short: 'MW',
+		region: 'Lilongwe',
+		city: 'Lilongwe',
+	},
+	{
+		country_short: 'MW',
+		region: 'Blantyre',
+		city: 'Blantyre',
+	},
+	{
+		country_short: 'MW',
+		region: 'Machinga',
+		city: 'Makata',
+	},
+	{
+		country_short: 'MW',
+		region: 'Mzimba',
+		city: 'Mzuzu',
+	},
+	{
+		country_short: 'AO',
+		region: 'Cabinda',
+		city: 'Cabinda',
+	},
+	{
+		country_short: 'AO',
+		region: 'Huambo',
+		city: 'Huambo',
+	},
+	{
+		country_short: 'AO',
+		region: 'Huila',
+		city: 'Lubango',
+	},
+	{
+		country_short: 'AO',
+		region: 'Cuanza-Sul',
+		city: 'Sumbe',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Eastern',
+		city: 'Petauke',
+	},
+	{
+		country_short: 'ZM',
+		region: 'Northern',
+		city: 'Kasama',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kilifi',
+		city: 'Malindi',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kwale',
+		city: 'Kwale',
+	},
+	{
+		country_short: 'KE',
+		region: 'Taita/Taveta',
+		city: 'Wundanyi',
+	},
+	{
+		country_short: 'KE',
+		region: 'Nyandarua',
+		city: 'Ndaragwa',
+	},
+	{
+		country_short: 'KE',
+		region: 'Siaya',
+		city: 'Siaya',
+	},
+	{
+		country_short: 'KE',
+		region: 'Machakos',
+		city: 'Athi River',
+	},
+	{
+		country_short: 'KE',
+		region: 'Uasin Gishu',
+		city: 'Eldoret',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kisumu',
+		city: 'Kisumu',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kisii',
+		city: 'Kisii',
+	},
+	{
+		country_short: 'KE',
+		region: 'Elgeyo/Marakwet',
+		city: 'Githurai',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kirinyaga',
+		city: 'Kerugoya',
+	},
+	{
+		country_short: 'KE',
+		region: 'Embu',
+		city: 'Embu',
+	},
+	{
+		country_short: 'KE',
+		region: 'Meru',
+		city: 'Nkubu',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kitui',
+		city: 'Kitui',
+	},
+	{
+		country_short: 'KE',
+		region: 'Laikipia',
+		city: 'Nanyuki',
+	},
+	{
+		country_short: 'ML',
+		region: 'Koulikoro',
+		city: 'Koulikoro',
+	},
+	{
+		country_short: 'ML',
+		region: 'Bamako',
+		city: 'Bamako',
+	},
+	{
+		country_short: 'ML',
+		region: 'Sikasso',
+		city: 'Bougouni',
+	},
+	{
+		country_short: 'ML',
+		region: 'Segou',
+		city: 'Segou',
+	},
+	{
+		country_short: 'BJ',
+		region: 'Oueme',
+		city: 'Porto-Novo',
+	},
+	{
+		country_short: 'BJ',
+		region: 'Littoral',
+		city: 'Cotonou',
+	},
+	{
+		country_short: 'BJ',
+		region: 'Atlantique',
+		city: 'Ouidah',
+	},
+	{
+		country_short: 'BW',
+		region: 'Kweneng',
+		city: 'Mogoditshane',
+	},
+	{
+		country_short: 'BW',
+		region: 'North East',
+		city: 'Francistown',
+	},
+	{
+		country_short: 'BW',
+		region: 'Central',
+		city: 'Palapye',
+	},
+	{
+		country_short: 'BW',
+		region: 'Kgatleng',
+		city: 'Mochudi',
+	},
+	{
+		country_short: 'LY',
+		region: 'Banghazi',
+		city: 'Benghazi',
+	},
+	{
+		country_short: 'GH',
+		region: 'Central',
+		city: 'Winneba',
+	},
+	{
+		country_short: 'CI',
+		region: 'Goh-Djiboua',
+		city: 'Divo',
+	},
+	{
+		country_short: 'CV',
+		region: 'Praia',
+		city: 'Praia',
+	},
+	{
+		country_short: 'CV',
+		region: 'Sao Vicente',
+		city: 'Mindelo',
+	},
+	{
+		country_short: 'CV',
+		region: 'Brava',
+		city: 'Nova Sintra',
+	},
+	{
+		country_short: 'CV',
+		region: 'Sal',
+		city: 'Santa Maria',
+	},
+	{
+		country_short: 'CV',
+		region: 'Ribeira Grande de Santiago',
+		city: 'Cidade Velha',
+	},
+	{
+		country_short: 'RW',
+		region: 'Ville de Kigali',
+		city: 'Kigali',
+	},
+	{
+		country_short: 'RW',
+		region: 'Est',
+		city: 'Kibungo',
+	},
+	{
+		country_short: 'RW',
+		region: 'Sud',
+		city: 'Nyanza',
+	},
+	{
+		country_short: 'AO',
+		region: 'Lunda-Sul',
+		city: 'Saurimo',
+	},
+	{
+		country_short: 'CG',
+		region: 'Brazzaville',
+		city: 'Brazzaville',
+	},
+	{
+		country_short: 'CG',
+		region: 'Pointe-Noire',
+		city: 'Pointe-Noire',
+	},
+	{
+		country_short: 'NG',
+		region: 'Bayelsa',
+		city: 'Ghana',
+	},
+	{
+		country_short: 'MW',
+		region: 'Karonga',
+		city: 'Livingstonia',
+	},
+	{
+		country_short: 'UG',
+		region: 'Wakiso',
+		city: 'Kireka',
+	},
+	{
+		country_short: 'UG',
+		region: 'Jinja',
+		city: 'Jinja',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Tete',
+		city: 'Tete',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Maputo',
+		city: 'Maputo',
+	},
+	{
+		country_short: 'GM',
+		region: 'Western',
+		city: 'Sukuta',
+	},
+	{
+		country_short: 'GM',
+		region: 'Banjul',
+		city: 'Banjul',
+	},
+	{
+		country_short: 'GM',
+		region: 'North Bank',
+		city: 'Farafenni',
+	},
+	{
+		country_short: 'GM',
+		region: 'Central River',
+		city: 'Bansang',
+	},
+	{
+		country_short: 'GM',
+		region: 'Lower River',
+		city: 'Soma',
+	},
+	{
+		country_short: 'LS',
+		region: 'Maseru',
+		city: 'Maseru',
+	},
+	{
+		country_short: 'MU',
+		region: 'Plaines Wilhems',
+		city: 'Quatre Bornes',
+	},
+	{
+		country_short: 'MU',
+		region: 'Moka',
+		city: 'Moka',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Sofala',
+		city: 'Beira',
+	},
+	{
+		country_short: 'KE',
+		region: 'Makueni',
+		city: 'Wote',
+	},
+	{
+		country_short: 'MG',
+		region: 'Antsiranana',
+		city: 'Antsiranana',
+	},
+	{
+		country_short: 'SS',
+		region: 'Central Equatoria',
+		city: 'Juba',
+	},
+	{
+		country_short: 'BW',
+		region: 'Southern',
+		city: 'Jwaneng',
+	},
+	{
+		country_short: 'MA',
+		region: 'Marrakech-Safi',
+		city: 'Marrakesh',
+	},
+	{
+		country_short: 'NE',
+		region: 'Niamey',
+		city: 'Niamey',
+	},
+	{
+		country_short: 'GN',
+		region: 'Conakry',
+		city: 'Conakry',
+	},
+	{
+		country_short: 'GN',
+		region: 'Dubreka',
+		city: 'Dubreka',
+	},
+	{
+		country_short: 'GN',
+		region: 'Boke',
+		city: 'Kamsar',
+	},
+	{
+		country_short: 'CD',
+		region: 'Haut-Katanga',
+		city: 'Lubumbashi',
+	},
+	{
+		country_short: 'CD',
+		region: 'Lualaba',
+		city: 'Goma',
+	},
+	{
+		country_short: 'BF',
+		region: 'Kadiogo',
+		city: 'Ouagadougou',
+	},
+	{
+		country_short: 'SO',
+		region: 'Banaadir',
+		city: 'Mogadishu',
+	},
+	{
+		country_short: 'SO',
+		region: 'Shabeellaha Hoose',
+		city: 'Afgooye',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Mashonaland West',
+		city: 'Chinhoyi',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Manicaland',
+		city: 'Mutare',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Midlands',
+		city: 'Redcliff',
+	},
+	{
+		country_short: 'SL',
+		region: 'Western Area',
+		city: 'Freetown',
+	},
+	{
+		country_short: 'NE',
+		region: 'Agadez',
+		city: 'Alaghsas',
+	},
+	{
+		country_short: 'CF',
+		region: 'Bangui',
+		city: 'Bangui',
+	},
+	{
+		country_short: 'CF',
+		region: 'Mambere-Kadei',
+		city: 'Berberati',
+	},
+	{
+		country_short: 'TG',
+		region: 'Maritime',
+		city: 'Aneho',
+	},
+	{
+		country_short: 'CD',
+		region: 'Ituri',
+		city: 'Bunia',
+	},
+	{
+		country_short: 'CD',
+		region: 'Sankuru',
+		city: 'Kananga',
+	},
+	{
+		country_short: 'CD',
+		region: 'Equateur',
+		city: 'Mbandaka',
+	},
+	{
+		country_short: 'MW',
+		region: 'Mwanza',
+		city: 'Mwanza',
+	},
+	{
+		country_short: 'GS',
+		region: 'South Georgia and the South Sandwich Islands',
+		city: 'King Edward Point',
+	},
+	{
+		country_short: 'GA',
+		region: 'Estuaire',
+		city: 'Libreville',
+	},
+	{
+		country_short: 'SS',
+		region: 'Unity',
+		city: 'Bentiu',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Masvingo',
+		city: 'Masvingo',
+	},
+	{
+		country_short: 'GQ',
+		region: 'Bioko Norte',
+		city: 'Malabo',
+	},
+	{
+		country_short: 'GQ',
+		region: 'Wele-Nzas',
+		city: 'Mongomo',
+	},
+	{
+		country_short: 'GQ',
+		region: 'Litoral',
+		city: 'Bata',
+	},
+	{
+		country_short: 'SC',
+		region: 'Anse Royale',
+		city: 'Anse Royale',
+	},
+	{
+		country_short: 'SC',
+		region: 'Baie Sainte Anne',
+		city: "Cote d'Or",
+	},
+	{
+		country_short: 'NG',
+		region: 'Bauchi',
+		city: 'Sade',
+	},
+	{
+		country_short: 'CV',
+		region: 'Sao Domingos',
+		city: 'Sao Domingos',
+	},
+	{
+		country_short: 'CV',
+		region: 'Boa Vista',
+		city: 'Sal Rei',
+	},
+	{
+		country_short: 'SO',
+		region: 'Woqooyi Galbeed',
+		city: 'Hargeysa',
+	},
+	{
+		country_short: 'SO',
+		region: 'Awdal',
+		city: 'Baki',
+	},
+	{
+		country_short: 'SO',
+		region: 'Togdheer',
+		city: 'Burco',
+	},
+	{
+		country_short: 'BI',
+		region: 'Gitega',
+		city: 'Gitega',
+	},
+	{
+		country_short: 'BI',
+		region: 'Kirundo',
+		city: 'Kirundo',
+	},
+	{
+		country_short: 'BI',
+		region: 'Rutana',
+		city: 'Rutana',
+	},
+	{
+		country_short: 'BI',
+		region: 'Ruyigi',
+		city: 'Ruyigi',
+	},
+	{
+		country_short: 'BI',
+		region: 'Cibitoke',
+		city: 'Cibitoke',
+	},
+	{
+		country_short: 'BI',
+		region: 'Rumonge',
+		city: 'Rumonge',
+	},
+	{
+		country_short: 'UG',
+		region: 'Mbarara',
+		city: 'Mbarara',
+	},
+	{
+		country_short: 'KE',
+		region: 'Bungoma',
+		city: 'Webuye',
+	},
+	{
+		country_short: 'KE',
+		region: 'Narok',
+		city: 'Narok',
+	},
+	{
+		country_short: 'KE',
+		region: 'Trans Nzoia',
+		city: 'Kitale',
+	},
+	{
+		country_short: 'KE',
+		region: 'Samburu',
+		city: 'Maralal',
+	},
+	{
+		country_short: 'KE',
+		region: 'Mandera',
+		city: 'Mandera',
+	},
+	{
+		country_short: 'KE',
+		region: 'Isiolo',
+		city: 'Maua',
+	},
+	{
+		country_short: 'KE',
+		region: 'Kakamega',
+		city: 'Kakamega',
+	},
+	{
+		country_short: 'KE',
+		region: 'Nandi',
+		city: 'Kapsabet',
+	},
+	{
+		country_short: 'KE',
+		region: 'Nyeri',
+		city: 'Othaya',
+	},
+	{
+		country_short: 'KE',
+		region: 'Migori',
+		city: 'Kehancha',
+	},
+	{
+		country_short: 'KE',
+		region: 'Tharaka-Nithi',
+		city: 'Chuka',
+	},
+	{
+		country_short: 'KE',
+		region: 'West Pokot',
+		city: 'Chepareria',
+	},
+	{
+		country_short: 'KE',
+		region: 'Nyamira',
+		city: 'Keroka',
+	},
+	{
+		country_short: 'KE',
+		region: 'Busia',
+		city: 'Nambale',
+	},
+	{
+		country_short: 'SN',
+		region: 'Dakar',
+		city: 'Dakar',
+	},
+	{
+		country_short: 'SN',
+		region: 'Kaffrine',
+		city: 'Kaffrine',
+	},
+	{
+		country_short: 'SN',
+		region: 'Saint-Louis',
+		city: 'Saint-Louis',
+	},
+	{
+		country_short: 'SN',
+		region: 'Ziguinchor',
+		city: 'Bignona',
+	},
+	{
+		country_short: 'SN',
+		region: 'Diourbel',
+		city: 'Mbake',
+	},
+	{
+		country_short: 'SN',
+		region: 'Tambacounda',
+		city: 'Tambacounda',
+	},
+	{
+		country_short: 'SN',
+		region: 'Thies',
+		city: 'Mekhe',
+	},
+	{
+		country_short: 'SN',
+		region: 'Kaolack',
+		city: 'Ndofane',
+	},
+	{
+		country_short: 'SN',
+		region: 'Sedhiou',
+		city: 'Sedhiou',
+	},
+	{
+		country_short: 'SN',
+		region: 'Kolda',
+		city: 'Kolda',
+	},
+	{
+		country_short: 'SN',
+		region: 'Fatick',
+		city: 'Sokone',
+	},
+	{
+		country_short: 'SN',
+		region: 'Louga',
+		city: 'Louga',
+	},
+	{
+		country_short: 'SN',
+		region: 'Matam',
+		city: 'Diawara',
+	},
+	{
+		country_short: 'LR',
+		region: 'Margibi',
+		city: 'Kakata',
+	},
+	{
+		country_short: 'LR',
+		region: 'Bong',
+		city: 'Gbarnga',
+	},
+	{
+		country_short: 'SC',
+		region: 'Pointe Larue',
+		city: 'Anse des Genets',
+	},
+	{
+		country_short: 'SC',
+		region: 'Takamaka',
+		city: 'Takamaka',
+	},
+	{
+		country_short: 'SC',
+		region: 'La Digue',
+		city: 'La Passe',
+	},
+	{
+		country_short: 'SC',
+		region: 'Anse aux Pins',
+		city: 'Anse aux Pins',
+	},
+	{
+		country_short: 'SC',
+		region: 'Grand Anse Mahe',
+		city: 'Misere',
+	},
+	{
+		country_short: 'SC',
+		region: 'Anse Boileau',
+		city: 'Anse Boileau',
+	},
+	{
+		country_short: 'BJ',
+		region: 'Zou',
+		city: 'Abomey',
+	},
+	{
+		country_short: 'BJ',
+		region: 'Mono',
+		city: 'Lokossa',
+	},
+	{
+		country_short: 'MA',
+		region: 'Casablanca-Settat',
+		city: 'Tit Mellil',
+	},
+	{
+		country_short: 'MA',
+		region: 'Rabat-Sale-Kenitra',
+		city: 'Rabat',
+	},
+	{
+		country_short: 'MA',
+		region: 'Fes- Meknes',
+		city: 'Skhirat',
+	},
+	{
+		country_short: 'MA',
+		region: "L'Oriental",
+		city: 'Madagh',
+	},
+	{
+		country_short: 'MA',
+		region: 'Souss-Massa',
+		city: 'Taghazout',
+	},
+	{
+		country_short: 'MA',
+		region: 'Guelmim-Oued Noun (EH-partial)',
+		city: 'Taourirt',
+	},
+	{
+		country_short: 'MA',
+		region: 'Draa-Tafilalet',
+		city: 'Jorf',
+	},
+	{
+		country_short: 'KE',
+		region: 'Bomet',
+		city: 'Bomet',
+	},
+	{
+		country_short: 'KE',
+		region: 'Baringo',
+		city: 'Baringo',
+	},
+	{
+		country_short: 'KE',
+		region: 'Lamu',
+		city: 'Lamu',
+	},
+	{
+		country_short: 'KE',
+		region: "Murang'a",
+		city: 'Maragua',
+	},
+	{
+		country_short: 'KE',
+		region: 'Garissa',
+		city: 'Garissa',
+	},
+	{
+		country_short: 'KE',
+		region: 'Marsabit',
+		city: 'Marsabit',
+	},
+	{
+		country_short: 'KE',
+		region: 'Turkana',
+		city: 'Lodwar',
+	},
+	{
+		country_short: 'CM',
+		region: 'Littoral',
+		city: 'Douala',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Gaza',
+		city: 'Manjacaze',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Inhambane',
+		city: 'Inhambane',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Manica',
+		city: 'Chimoio',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Zambezia',
+		city: 'Quelimane',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Niassa',
+		city: 'Lichinga',
+	},
+	{
+		country_short: 'SD',
+		region: 'South Kordofan',
+		city: 'Al Fulah',
+	},
+	{
+		country_short: 'SD',
+		region: 'West Kordofan',
+		city: 'Al Mijlad',
+	},
+	{
+		country_short: 'SD',
+		region: 'Gedaref',
+		city: 'Al Hawatah',
+	},
+	{
+		country_short: 'SD',
+		region: 'North Kordofan',
+		city: 'Barah',
+	},
+	{
+		country_short: 'SD',
+		region: 'Sennar',
+		city: 'Singa',
+	},
+	{
+		country_short: 'SD',
+		region: 'River Nile',
+		city: 'El Bauga',
+	},
+	{
+		country_short: 'SD',
+		region: 'Red Sea',
+		city: 'Sawakin',
+	},
+	{
+		country_short: 'SD',
+		region: 'West Darfur',
+		city: 'Geneina',
+	},
+	{
+		country_short: 'SD',
+		region: 'North Darfur',
+		city: 'Umm Kaddadah',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Oran',
+		city: 'Oran',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Mascara',
+		city: 'Mascara',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Mostaganem',
+		city: 'Mostaganem',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Ain Temouchent',
+		city: 'El Amria',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Relizane',
+		city: 'Relizane',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Alger',
+		city: 'Algiers',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Oum el Bouaghi',
+		city: 'Ain Beida',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Setif',
+		city: 'Setif',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Naama',
+		city: 'Naama',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Sidi Bel Abbes',
+		city: 'Sfizef',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Djelfa',
+		city: 'Djelfa',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tlemcen',
+		city: 'Chetouane',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Laghouat',
+		city: 'Laghouat',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Saida',
+		city: 'Saida',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Annaba',
+		city: 'Annaba',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Bechar',
+		city: 'Bechar',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tindouf',
+		city: 'Tindouf',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Adrar',
+		city: 'Adrar',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tiaret',
+		city: 'Tiaret',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Chlef',
+		city: 'Chlef',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tissemsilt',
+		city: 'Tissemsilt',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Ain Defla',
+		city: 'Theniet el Had',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Blida',
+		city: 'Blida',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tipaza',
+		city: 'El Affroun',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Medea',
+		city: "'Ain Boucif",
+	},
+	{
+		country_short: 'DZ',
+		region: 'Ouargla',
+		city: 'Hassi Messaoud',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tamanrasset',
+		city: 'Tamanrasset',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Ghardaia',
+		city: 'Berriane',
+	},
+	{
+		country_short: 'DZ',
+		region: 'El Oued',
+		city: 'Robbah',
+	},
+	{
+		country_short: 'DZ',
+		region: 'El Bayadh',
+		city: 'El Bayadh',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Bouira',
+		city: 'Sour el Ghozlane',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Boumerdes',
+		city: 'Boumerdas',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tizi Ouzou',
+		city: 'Beni Douala',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Illizi',
+		city: 'Illizi',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Constantine',
+		city: 'Constantine',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Mila',
+		city: 'Telerghma',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Biskra',
+		city: 'Biskra',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Batna',
+		city: 'Batna',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Jijel',
+		city: 'Mechta Ouled Bou Khina',
+	},
+	{
+		country_short: 'AS',
+		region: 'Eastern District',
+		city: 'Pago Pago',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Bordj Bou Arreridj',
+		city: 'Bordj Bou Arreridj',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Bejaia',
+		city: 'Akbou',
+	},
+	{
+		country_short: 'EG',
+		region: 'Al Wadi al Jadid',
+		city: 'Al Kharijah',
+	},
+	{
+		country_short: 'MU',
+		region: 'Savanne',
+		city: 'Chamouny',
+	},
+	{
+		country_short: 'MU',
+		region: 'Grand Port',
+		city: 'Nouvelle France',
+	},
+	{
+		country_short: 'MU',
+		region: 'Rodrigues Islands',
+		city: 'Le Morne',
+	},
+	{
+		country_short: 'MU',
+		region: 'Pamplemousses',
+		city: 'Terre Rouge',
+	},
+	{
+		country_short: 'MU',
+		region: 'Black River',
+		city: 'Flic en Flac',
+	},
+	{
+		country_short: 'MU',
+		region: 'Riviere du Rempart',
+		city: 'Amaury',
+	},
+	{
+		country_short: 'MU',
+		region: 'Flacq',
+		city: 'Lalmatie',
+	},
+	{
+		country_short: 'NE',
+		region: 'Tahoua',
+		city: 'Tahoua',
+	},
+	{
+		country_short: 'NE',
+		region: 'Zinder',
+		city: 'Zinder',
+	},
+	{
+		country_short: 'NE',
+		region: 'Dosso',
+		city: 'Dogondoutchi',
+	},
+	{
+		country_short: 'BW',
+		region: 'North West',
+		city: 'Maun',
+	},
+	{
+		country_short: 'BF',
+		region: 'Houet',
+		city: 'Bobo-Dioulasso',
+	},
+	{
+		country_short: 'BF',
+		region: 'Bam',
+		city: 'Kongoussi',
+	},
+	{
+		country_short: 'BF',
+		region: 'Bougouriba',
+		city: 'Diebougou',
+	},
+	{
+		country_short: 'BF',
+		region: 'Kenedougou',
+		city: 'Orodara',
+	},
+	{
+		country_short: 'MR',
+		region: 'Nouakchott Ouest',
+		city: 'Nouakchott',
+	},
+	{
+		country_short: 'MR',
+		region: 'Dakhlet Nouadhibou',
+		city: 'Nouadhibou',
+	},
+	{
+		country_short: 'MR',
+		region: 'Tiris Zemmour',
+		city: 'Zouerate',
+	},
+	{
+		country_short: 'GA',
+		region: 'Haut-Ogooue',
+		city: 'Moanda',
+	},
+	{
+		country_short: 'GA',
+		region: 'Ogooue-Maritime',
+		city: 'Port-Gentil',
+	},
+	{
+		country_short: 'GA',
+		region: 'Woleu-Ntem',
+		city: 'Oyem',
+	},
+	{
+		country_short: 'GA',
+		region: 'Ogooue-Lolo',
+		city: 'Koulamoutou',
+	},
+	{
+		country_short: 'GA',
+		region: 'Ngounie',
+		city: 'Mouila',
+	},
+	{
+		country_short: 'NA',
+		region: 'Otjozondjupa',
+		city: 'Otjiwarongo',
+	},
+	{
+		country_short: 'NA',
+		region: 'Omaheke',
+		city: 'Gobabis',
+	},
+	{
+		country_short: 'NA',
+		region: 'Ohangwena',
+		city: 'Oshikango',
+	},
+	{
+		country_short: 'NA',
+		region: 'Karas',
+		city: 'Luderitz',
+	},
+	{
+		country_short: 'NA',
+		region: 'Kavango East',
+		city: 'Rundu',
+	},
+	{
+		country_short: 'NA',
+		region: 'Oshana',
+		city: 'Oshakati',
+	},
+	{
+		country_short: 'NA',
+		region: 'Zambezi',
+		city: 'Katima Mulilo',
+	},
+	{
+		country_short: 'RW',
+		region: 'Ouest',
+		city: 'Gisenyi',
+	},
+	{
+		country_short: 'RW',
+		region: 'Nord',
+		city: 'Ruhengeri',
+	},
+	{
+		country_short: 'MG',
+		region: 'Toamasina',
+		city: 'Ambatondrazaka',
+	},
+	{
+		country_short: 'MR',
+		region: 'Trarza',
+		city: 'Rosso',
+	},
+	{
+		country_short: 'MR',
+		region: 'Gorgol',
+		city: 'Kaedi',
+	},
+	{
+		country_short: 'MR',
+		region: 'Assaba',
+		city: 'Kiffa',
+	},
+	{
+		country_short: 'MR',
+		region: 'Hodh ech Chargui',
+		city: 'Nema',
+	},
+	{
+		country_short: 'MR',
+		region: 'Adrar',
+		city: 'Atar',
+	},
+	{
+		country_short: 'MR',
+		region: 'Inchiri',
+		city: 'Akjoujt',
+	},
+	{
+		country_short: 'MR',
+		region: 'Brakna',
+		city: 'Aleg',
+	},
+	{
+		country_short: 'MR',
+		region: 'Tagant',
+		city: 'Tidjikja',
+	},
+	{
+		country_short: 'MR',
+		region: 'Hodh el Gharbi',
+		city: 'Ayoun el Atrous',
+	},
+	{
+		country_short: 'CI',
+		region: 'Denguele',
+		city: 'Odienne',
+	},
+	{
+		country_short: 'CI',
+		region: 'Zanzan',
+		city: 'Tanda',
+	},
+	{
+		country_short: 'CD',
+		region: 'Kasai Central',
+		city: 'Matadi',
+	},
+	{
+		country_short: 'ZW',
+		region: 'Mashonaland Central',
+		city: 'Bindura',
+	},
+	{
+		country_short: 'MW',
+		region: 'Chiradzulu',
+		city: 'Chiradzulu',
+	},
+	{
+		country_short: 'MW',
+		region: 'Dowa',
+		city: 'Mponela',
+	},
+	{
+		country_short: 'UG',
+		region: 'Gulu',
+		city: 'Gulu',
+	},
+	{
+		country_short: 'UG',
+		region: 'Nakasongola',
+		city: 'Nakasongola',
+	},
+	{
+		country_short: 'CM',
+		region: 'Ouest',
+		city: 'Bafoussam',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kiruhura',
+		city: 'Mweza',
+	},
+	{
+		country_short: 'BJ',
+		region: 'Plateau',
+		city: 'Pobe',
+	},
+	{
+		country_short: 'BJ',
+		region: 'Borgou',
+		city: 'Parakou',
+	},
+	{
+		country_short: 'LR',
+		region: 'Nimba',
+		city: 'Sanniquellie',
+	},
+	{
+		country_short: 'SC',
+		region: 'Baie Lazare',
+		city: 'Baie Lazare',
+	},
+	{
+		country_short: 'BW',
+		region: 'Ghanzi',
+		city: 'Ghanzi',
+	},
+	{
+		country_short: 'BW',
+		region: 'Chobe',
+		city: 'Kasane',
+	},
+	{
+		country_short: 'CU',
+		region: 'La Habana',
+		city: 'Havana',
+	},
+	{
+		country_short: 'KM',
+		region: 'Grande Comore',
+		city: 'Moroni',
+	},
+	{
+		country_short: 'IO',
+		region: 'British Indian Ocean Territory',
+		city: 'Diego Garcia',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Guelma',
+		city: 'Heliopolis',
+	},
+	{
+		country_short: 'DZ',
+		region: 'El Tarf',
+		city: 'El Kala',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Souk Ahras',
+		city: 'Souk Ahras',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Skikda',
+		city: 'Azzaba',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Tebessa',
+		city: 'Tebessa',
+	},
+	{
+		country_short: 'DZ',
+		region: 'Khenchela',
+		city: 'Khenchela',
+	},
+	{
+		country_short: 'CM',
+		region: 'Adamaoua',
+		city: 'Meiganga',
+	},
+	{
+		country_short: 'CM',
+		region: 'Sud',
+		city: 'Kribi',
+	},
+	{
+		country_short: 'CM',
+		region: 'Sud-Ouest',
+		city: 'Limbe',
+	},
+	{
+		country_short: 'CM',
+		region: 'Nord',
+		city: 'Garoua',
+	},
+	{
+		country_short: 'CM',
+		region: 'Est',
+		city: 'Bertoua',
+	},
+	{
+		country_short: 'CM',
+		region: 'Nord-Ouest',
+		city: 'Bali',
+	},
+	{
+		country_short: 'CM',
+		region: 'Extreme-Nord',
+		city: 'Maroua',
+	},
+	{
+		country_short: 'UG',
+		region: 'Mukono',
+		city: 'Mukono',
+	},
+	{
+		country_short: 'NG',
+		region: 'Ekiti',
+		city: 'Ifaki',
+	},
+	{
+		country_short: 'BF',
+		region: 'Mouhoun',
+		city: 'Dedougou',
+	},
+	{
+		country_short: 'BF',
+		region: 'Sanmatenga',
+		city: 'Kaya',
+	},
+	{
+		country_short: 'BF',
+		region: 'Boulkiemde',
+		city: 'Koudougou',
+	},
+	{
+		country_short: 'BF',
+		region: 'Yatenga',
+		city: 'Ouahigouya',
+	},
+	{
+		country_short: 'BF',
+		region: 'Bale',
+		city: 'Boromo',
+	},
+	{
+		country_short: 'BF',
+		region: 'Boulgou',
+		city: 'Tenkodogo',
+	},
+	{
+		country_short: 'TG',
+		region: 'Kara',
+		city: 'Kande',
+	},
+	{
+		country_short: 'TG',
+		region: 'Plateaux',
+		city: 'Atakpame',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Wahat',
+		city: 'Al Burayqah',
+	},
+	{
+		country_short: 'LY',
+		region: 'Misratah',
+		city: 'Bani Walid',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Marqab',
+		city: 'Al Khums',
+	},
+	{
+		country_short: 'SN',
+		region: 'Kedougou',
+		city: 'Kedougou',
+	},
+	{
+		country_short: 'UG',
+		region: 'Arua',
+		city: 'Arua',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kyenjojo',
+		city: 'Kyenjojo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Zombo',
+		city: 'Paidha',
+	},
+	{
+		country_short: 'UG',
+		region: 'Hoima',
+		city: 'Hoima',
+	},
+	{
+		country_short: 'UG',
+		region: 'Busia',
+		city: 'Busia',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kabarole',
+		city: 'Fort Portal',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kabale',
+		city: 'Kabale',
+	},
+	{
+		country_short: 'SZ',
+		region: 'Manzini',
+		city: 'Manzini',
+	},
+	{
+		country_short: 'SZ',
+		region: 'Shiselweni',
+		city: 'Hlatikulu',
+	},
+	{
+		country_short: 'KE',
+		region: 'Wajir',
+		city: 'Wajir',
+	},
+	{
+		country_short: 'CV',
+		region: 'Mosteiros',
+		city: 'Porto dos Mosteiros',
+	},
+	{
+		country_short: 'CV',
+		region: 'Tarrafal',
+		city: 'Tarrafal',
+	},
+	{
+		country_short: 'CV',
+		region: 'Porto Novo',
+		city: 'Porto Novo',
+	},
+	{
+		country_short: 'ZM',
+		region: 'North-Western',
+		city: 'Solwezi',
+	},
+	{
+		country_short: 'MW',
+		region: 'Salima',
+		city: 'Salima',
+	},
+	{
+		country_short: 'TD',
+		region: 'Ville de Ndjamena',
+		city: "N'Djamena",
+	},
+	{
+		country_short: 'NA',
+		region: 'Omusati',
+		city: 'Outapi',
+	},
+	{
+		country_short: 'AO',
+		region: 'Moxico',
+		city: 'Luena',
+	},
+	{
+		country_short: 'AO',
+		region: 'Bengo',
+		city: 'Caxito',
+	},
+	{
+		country_short: 'AO',
+		region: 'Uige',
+		city: 'Uige',
+	},
+	{
+		country_short: 'AO',
+		region: 'Namibe',
+		city: 'Namibe',
+	},
+	{
+		country_short: 'AO',
+		region: 'Cunene',
+		city: 'Ondjiva',
+	},
+	{
+		country_short: 'CD',
+		region: 'Kasai Oriental',
+		city: 'Mbuji-Mayi',
+	},
+	{
+		country_short: 'CD',
+		region: 'Sud-Kivu',
+		city: 'Bukavu',
+	},
+	{
+		country_short: 'NG',
+		region: 'Benue',
+		city: 'Makurdi',
+	},
+	{
+		country_short: 'AO',
+		region: 'Cuando Cubango',
+		city: 'Menongue',
+	},
+	{
+		country_short: 'AO',
+		region: 'Lunda-Norte',
+		city: 'Lucapa',
+	},
+	{
+		country_short: 'GH',
+		region: 'Bono East',
+		city: 'Techiman',
+	},
+	{
+		country_short: 'UG',
+		region: 'Iganga',
+		city: 'Iganga',
+	},
+	{
+		country_short: 'UG',
+		region: 'Mubende',
+		city: 'Mubende',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kanungu',
+		city: 'Ntungamo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Butaleja',
+		city: 'Butaleja',
+	},
+	{
+		country_short: 'MW',
+		region: 'Mangochi',
+		city: 'Mangochi',
+	},
+	{
+		country_short: 'MW',
+		region: 'Thyolo',
+		city: 'Thyolo',
+	},
+	{
+		country_short: 'MW',
+		region: 'Nkhotakota',
+		city: 'Nkhotakota',
+	},
+	{
+		country_short: 'ML',
+		region: 'Mopti',
+		city: 'Mopti',
+	},
+	{
+		country_short: 'AO',
+		region: 'Zaire',
+		city: 'Soio',
+	},
+	{
+		country_short: 'UG',
+		region: 'Masaka',
+		city: 'Masaka',
+	},
+	{
+		country_short: 'AO',
+		region: 'Cuanza-Norte',
+		city: "N'dalatando",
+	},
+	{
+		country_short: 'GH',
+		region: 'Ahafo',
+		city: 'Goaso',
+	},
+	{
+		country_short: 'BW',
+		region: 'Kgalagadi',
+		city: 'Tshabong',
+	},
+	{
+		country_short: 'SO',
+		region: 'Bari',
+		city: 'Bosaso',
+	},
+	{
+		country_short: 'CF',
+		region: 'Ouaka',
+		city: 'Ippy',
+	},
+	{
+		country_short: 'TN',
+		region: 'Le Kef',
+		city: 'El Kef',
+	},
+	{
+		country_short: 'TN',
+		region: 'Kasserine',
+		city: 'Kasserine',
+	},
+	{
+		country_short: 'MG',
+		region: 'Fianarantsoa',
+		city: 'Ambositra',
+	},
+	{
+		country_short: 'CD',
+		region: 'Kwilu',
+		city: 'Bandundu',
+	},
+	{
+		country_short: 'CD',
+		region: 'Tanganyika',
+		city: 'Kalemie',
+	},
+	{
+		country_short: 'MA',
+		region: 'Laayoune-Sakia El Hamra (EH-partial)',
+		city: 'Tarfaya',
+	},
+	{
+		country_short: 'LY',
+		region: 'Sabha',
+		city: 'Sabha',
+	},
+	{
+		country_short: 'LY',
+		region: "Wadi ash Shati'",
+		city: 'Brak',
+	},
+	{
+		country_short: 'LY',
+		region: 'Az Zawiyah',
+		city: 'Surman',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Jabal al Gharbi',
+		city: 'Gharyan',
+	},
+	{
+		country_short: 'LY',
+		region: 'Surt',
+		city: 'Sirte',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Jabal al Akhdar',
+		city: "Al Bayda'",
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Marj',
+		city: 'Al Abyar',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Jufrah',
+		city: 'Hun',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Kufrah',
+		city: 'At Taj',
+	},
+	{
+		country_short: 'LY',
+		region: 'Darnah',
+		city: 'Darnah',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Butnan',
+		city: 'Tobruk',
+	},
+	{
+		country_short: 'LY',
+		region: 'Al Jafarah',
+		city: "Al 'Aziziyah",
+	},
+	{
+		country_short: 'SH',
+		region: ' Ascension and Tristan Da Cunha"',
+		city: 'Saint Helena',
+	},
+	{
+		country_short: 'IN',
+		region: 'Dadra and Nagar Haveli',
+		city: 'Silvassa',
+	},
+	{
+		country_short: 'IN',
+		region: 'Dadra and Nagar Haveli and Daman and Diu',
+		city: 'Daman',
+	},
+	{
+		country_short: 'MY',
+		region: 'Wilayah Persekutuan Labuan',
+		city: 'Victoria',
+	},
+	{
+		country_short: 'MY',
+		region: 'Perlis',
+		city: 'Arau',
+	},
+	{
+		country_short: 'LA',
+		region: 'Savannakhet',
+		city: 'Savannakhet',
+	},
+	{
+		country_short: 'LA',
+		region: 'Attapu',
+		city: 'Attapeu',
+	},
+	{
+		country_short: 'LA',
+		region: 'Khammouan',
+		city: 'Thakhek',
+	},
+	{
+		country_short: 'MM',
+		region: 'Magway',
+		city: 'Magway',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Taranaki',
+		city: 'Douglas',
+	},
+	{
+		country_short: 'NC',
+		region: 'Province Nord',
+		city: 'Kaala-Gomen',
+	},
+	{
+		country_short: 'LK',
+		region: 'Central Province',
+		city: 'Kandy',
+	},
+	{
+		country_short: 'NP',
+		region: 'Mahakali',
+		city: 'Mahendranagar',
+	},
+	{
+		country_short: 'NR',
+		region: 'Yaren',
+		city: 'Yaren',
+	},
+	{
+		country_short: 'MV',
+		region: 'South Miladhunmadulu',
+		city: 'Manadhoo',
+	},
+	{
+		country_short: 'WS',
+		region: 'Tuamasaga',
+		city: 'Apia',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Southland',
+		city: 'Invercargill',
+	},
+	{
+		country_short: 'MM',
+		region: 'Nay Pyi Taw',
+		city: 'Nay Pyi Taw',
+	},
+	{
+		country_short: 'GU',
+		region: 'Hagatna',
+		city: 'Hagatna',
+	},
+	{
+		country_short: 'FM',
+		region: 'Pohnpei',
+		city: 'Palikir - National Government Center',
+	},
+	{
+		country_short: 'FM',
+		region: 'Kosrae',
+		city: 'Lelu',
+	},
+	{
+		country_short: 'PF',
+		region: 'Iles du Vent',
+		city: 'Papeete',
+	},
+	{
+		country_short: 'LA',
+		region: 'Champasak',
+		city: 'Pakse',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kampong Chhnang',
+		city: 'Kampong Chhnang',
+	},
+	{
+		country_short: 'TO',
+		region: "Ha'apai",
+		city: 'Pangai',
+	},
+	{
+		country_short: 'AT',
+		region: 'Vorarlberg',
+		city: 'Feldkirch',
+	},
+	{
+		country_short: 'HN',
+		region: 'La Paz',
+		city: 'Marcala',
+	},
+	{
+		country_short: 'HN',
+		region: 'Ocotepeque',
+		city: 'Sensenti',
+	},
+	{
+		country_short: 'HN',
+		region: 'Cortes',
+		city: 'San Pedro Sula',
+	},
+	{
+		country_short: 'AR',
+		region: 'Rio Negro',
+		city: 'San Antonio Oeste',
+	},
+	{
+		country_short: 'HN',
+		region: 'Francisco Morazan',
+		city: 'Tegucigalpa',
+	},
+	{
+		country_short: 'HN',
+		region: 'Comayagua',
+		city: 'Siguatepeque',
+	},
+	{
+		country_short: 'CL',
+		region: 'La Araucania',
+		city: 'Villarrica',
+	},
+	{
+		country_short: 'EC',
+		region: 'Manabi',
+		city: 'Manta',
+	},
+	{
+		country_short: 'AR',
+		region: 'Santa Cruz',
+		city: 'Perito Moreno',
+	},
+	{
+		country_short: 'BR',
+		region: 'Rio Grande do Norte',
+		city: 'Areia Branca',
+	},
+	{
+		country_short: 'AR',
+		region: 'Misiones',
+		city: 'Puerto Eldorado',
+	},
+	{
+		country_short: 'BR',
+		region: 'Sergipe',
+		city: 'Aracaju',
+	},
+	{
+		country_short: 'PE',
+		region: 'Loreto',
+		city: 'Yurimaguas',
+	},
+	{
+		country_short: 'PE',
+		region: 'Puno',
+		city: 'La Rinconada',
+	},
+	{
+		country_short: 'HN',
+		region: 'Atlantida',
+		city: 'La Ceiba',
+	},
+	{
+		country_short: 'HN',
+		region: 'Islas de la Bahia',
+		city: 'Roatan',
+	},
+	{
+		country_short: 'GT',
+		region: 'Alta Verapaz',
+		city: 'Tucuru',
+	},
+	{
+		country_short: 'GT',
+		region: 'Quetzaltenango',
+		city: 'Coatepeque',
+	},
+	{
+		country_short: 'GT',
+		region: 'Chiquimula',
+		city: 'Chiquimula',
+	},
+	{
+		country_short: 'GT',
+		region: 'Escuintla',
+		city: 'Nueva Concepcion',
+	},
+	{
+		country_short: 'GT',
+		region: 'Izabal',
+		city: 'Morales',
+	},
+	{
+		country_short: 'AR',
+		region: 'Jujuy',
+		city: 'San Salvador de Jujuy',
+	},
+	{
+		country_short: 'BR',
+		region: 'Roraima',
+		city: 'Baliza',
+	},
+	{
+		country_short: 'NI',
+		region: 'Rivas',
+		city: 'San Jorge',
+	},
+	{
+		country_short: 'NI',
+		region: 'Carazo',
+		city: 'Santa Teresa',
+	},
+	{
+		country_short: 'AR',
+		region: 'Tucuman',
+		city: 'San Miguel de Tucuman',
+	},
+	{
+		country_short: 'MX',
+		region: 'Sinaloa',
+		city: 'Los Mochis',
+	},
+	{
+		country_short: 'CH',
+		region: 'Graubunden',
+		city: 'Chur',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint Paul Charlestown',
+		city: 'Charlestown',
+	},
+	{
+		country_short: 'JM',
+		region: 'Saint James',
+		city: 'Montego Bay',
+	},
+	{
+		country_short: 'MS',
+		region: 'Saint Anthony',
+		city: 'Plymouth',
+	},
+	{
+		country_short: 'TC',
+		region: 'Turks and Caicos Islands',
+		city: 'Cockburn Town',
+	},
+	{
+		country_short: 'PH',
+		region: 'Camarines Sur',
+		city: 'San Miguel',
+	},
+	{
+		country_short: 'CO',
+		region: 'Magdalena',
+		city: 'Santa Marta',
+	},
+	{
+		country_short: 'CO',
+		region: 'Boyaca',
+		city: 'Duitama',
+	},
+	{
+		country_short: 'PE',
+		region: 'Junin',
+		city: 'Jauja',
+	},
+	{
+		country_short: 'PE',
+		region: 'La Libertad',
+		city: 'Trujillo',
+	},
+	{
+		country_short: 'MD',
+		region: 'Drochia',
+		city: 'Drochia',
+	},
+	{
+		country_short: 'AR',
+		region: 'Formosa',
+		city: 'El Colorado',
+	},
+	{
+		country_short: 'EC',
+		region: 'Imbabura',
+		city: 'Cotacachi',
+	},
+	{
+		country_short: 'EC',
+		region: 'Chimborazo',
+		city: 'Riobamba',
+	},
+	{
+		country_short: 'EC',
+		region: 'Carchi',
+		city: 'El Angel',
+	},
+	{
+		country_short: 'BZ',
+		region: 'Belize',
+		city: 'San Pedro',
+	},
+	{
+		country_short: 'EC',
+		region: 'Canar',
+		city: 'Azogues',
+	},
+	{
+		country_short: 'EC',
+		region: 'Morona Santiago',
+		city: 'Gualaquiza',
+	},
+	{
+		country_short: 'EC',
+		region: 'Bolivar',
+		city: 'San Miguel',
+	},
+	{
+		country_short: 'EC',
+		region: 'Loja',
+		city: 'Loja',
+	},
+	{
+		country_short: 'CW',
+		region: 'Curacao',
+		city: 'Willemstad',
+	},
+	{
+		country_short: 'CO',
+		region: 'Caqueta',
+		city: 'Florencia',
+	},
+	{
+		country_short: 'EC',
+		region: 'Orellana',
+		city: 'La Joya de los Sachas',
+	},
+	{
+		country_short: 'EC',
+		region: 'Esmeraldas',
+		city: 'San Lorenzo de Esmeraldas',
+	},
+	{
+		country_short: 'MT',
+		region: 'Gzira',
+		city: 'Gzira',
+	},
+	{
+		country_short: 'PH',
+		region: 'Cagayan',
+		city: 'Claveria',
+	},
+	{
+		country_short: 'FJ',
+		region: 'Eastern',
+		city: 'Waidradranu Settlement',
+	},
+	{
+		country_short: 'LK',
+		region: 'North Western Province',
+		city: 'Kurunegala',
+	},
+	{
+		country_short: 'LK',
+		region: 'Southern Province',
+		city: 'Tangalle',
+	},
+	{
+		country_short: 'LV',
+		region: 'Kekavas novads',
+		city: 'Kekava',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Jizzax',
+		city: 'Dustlik',
+	},
+	{
+		country_short: 'LB',
+		region: 'Aakkar',
+		city: 'Halba',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Agcabadi',
+		city: 'Agdzhabedy',
+	},
+	{
+		country_short: 'PN',
+		region: 'Pitcairn',
+		city: 'Adamstown',
+	},
+	{
+		country_short: 'CC',
+		region: 'Cocos (Keeling) Islands',
+		city: 'West Island',
+	},
+	{
+		country_short: 'NF',
+		region: 'Norfolk Island',
+		city: 'Kingston',
+	},
+	{
+		country_short: 'NU',
+		region: 'Niue',
+		city: 'Alofi',
+	},
+	{
+		country_short: 'CX',
+		region: 'Christmas Island',
+		city: 'Flying Fish Cove',
+	},
+	{
+		country_short: 'FK',
+		region: 'Falkland Islands (Malvinas)',
+		city: 'Stanley',
+	},
+	{
+		country_short: 'TV',
+		region: 'Funafuti',
+		city: 'Funafuti',
+	},
+	{
+		country_short: 'PW',
+		region: 'Melekeok',
+		city: 'Melekeok - Palau State Capital',
+	},
+	{
+		country_short: 'AX',
+		region: 'Mariehamn',
+		city: 'Mariehamn',
+	},
+	{
+		country_short: 'SX',
+		region: 'Sint Maarten (Dutch Part)',
+		city: 'Philipsburg',
+	},
+	{
+		country_short: 'MH',
+		region: 'Majuro',
+		city: 'Majuro',
+	},
+	{
+		country_short: 'KI',
+		region: 'Gilbert Islands',
+		city: 'Tarawa',
+	},
+	{
+		country_short: 'SI',
+		region: 'Novo Mesto',
+		city: 'Novo Mesto',
+	},
+	{
+		country_short: 'LB',
+		region: 'Nabatiye',
+		city: 'Hasbaiya',
+	},
+	{
+		country_short: 'BO',
+		region: 'Chuquisaca',
+		city: 'Sucre',
+	},
+	{
+		country_short: 'SI',
+		region: 'Litija',
+		city: 'Litija',
+	},
+	{
+		country_short: 'IE',
+		region: 'Laois',
+		city: 'Durrow',
+	},
+	{
+		country_short: 'MT',
+		region: 'Rabat Malta',
+		city: 'Rabat',
+	},
+	{
+		country_short: 'PY',
+		region: 'Alto Parana',
+		city: 'Hernandarias',
+	},
+	{
+		country_short: 'CR',
+		region: 'Guanacaste',
+		city: 'Juntas',
+	},
+	{
+		country_short: 'CL',
+		region: "Libertador General Bernardo O'Higgins",
+		city: 'Chimbarongo',
+	},
+	{
+		country_short: 'CL',
+		region: 'Coquimbo',
+		city: 'Illapel',
+	},
+	{
+		country_short: 'CL',
+		region: 'Nuble',
+		city: 'Quillon',
+	},
+	{
+		country_short: 'PY',
+		region: 'Amambay',
+		city: 'Pedro Juan Caballero',
+	},
+	{
+		country_short: 'PY',
+		region: 'San Pedro',
+		city: 'Nueva Germania',
+	},
+	{
+		country_short: 'EC',
+		region: 'Santa Elena',
+		city: 'Santa Elena',
+	},
+	{
+		country_short: 'DO',
+		region: 'La Altagracia',
+		city: 'Uvero Alto',
+	},
+	{
+		country_short: 'MX',
+		region: 'Yucatan',
+		city: 'Merida',
+	},
+	{
+		country_short: 'GT',
+		region: 'Quiche',
+		city: 'Santa Cruz del Quiche',
+	},
+	{
+		country_short: 'GT',
+		region: 'Solola',
+		city: 'Santa Lucia Utatlan',
+	},
+	{
+		country_short: 'DO',
+		region: 'La Romana',
+		city: 'La Romana',
+	},
+	{
+		country_short: 'SV',
+		region: 'Sonsonate',
+		city: 'Acajutla',
+	},
+	{
+		country_short: 'VE',
+		region: 'Miranda',
+		city: 'San Antonio de Los Altos',
+	},
+	{
+		country_short: 'HN',
+		region: 'Santa Barbara',
+		city: 'Sula',
+	},
+	{
+		country_short: 'HN',
+		region: 'Lempira',
+		city: 'Gracias',
+	},
+	{
+		country_short: 'MX',
+		region: 'Nayarit',
+		city: 'Bucerias',
+	},
+	{
+		country_short: 'CO',
+		region: 'Cordoba',
+		city: 'Monteria',
+	},
+	{
+		country_short: 'VE',
+		region: 'Monagas',
+		city: 'Maturin',
+	},
+	{
+		country_short: 'PE',
+		region: 'Ica',
+		city: 'Chanchamayo',
+	},
+	{
+		country_short: 'CO',
+		region: 'Putumayo',
+		city: 'La Hormiga',
+	},
+	{
+		country_short: 'PY',
+		region: 'Itapua',
+		city: 'Obligado',
+	},
+	{
+		country_short: 'HN',
+		region: 'El Paraiso',
+		city: 'Teupasenti',
+	},
+	{
+		country_short: 'PE',
+		region: 'Piura',
+		city: 'Piura',
+	},
+	{
+		country_short: 'PY',
+		region: 'Canindeyu',
+		city: 'Colonia Catuete',
+	},
+	{
+		country_short: 'PY',
+		region: 'Guaira',
+		city: 'Villarrica',
+	},
+	{
+		country_short: 'NI',
+		region: 'Chontales',
+		city: 'Juigalpa',
+	},
+	{
+		country_short: 'CO',
+		region: 'Guaviare',
+		city: 'San Jose del Guaviare',
+	},
+	{
+		country_short: 'EC',
+		region: 'Sucumbios',
+		city: 'Lago Agrio',
+	},
+	{
+		country_short: 'CO',
+		region: 'San Andres, Providencia y Santa Catalina',
+		city: 'San Andres, Providencia y Santa Catalina',
+	},
+	{
+		country_short: 'PE',
+		region: 'El Callao',
+		city: 'Callao',
+	},
+	{
+		country_short: 'GT',
+		region: 'Jutiapa',
+		city: 'Jutiapa',
+	},
+	{
+		country_short: 'VE',
+		region: 'Amazonas',
+		city: 'Puerto Ayacucho',
+	},
+	{
+		country_short: 'MX',
+		region: 'Oaxaca',
+		city: 'San Jose Chiltepec',
+	},
+	{
+		country_short: 'HN',
+		region: 'Colon',
+		city: 'Saba',
+	},
+	{
+		country_short: 'DO',
+		region: 'San Jose de Ocoa',
+		city: 'Banilejo',
+	},
+	{
+		country_short: 'DO',
+		region: 'El Seibo',
+		city: 'Santa Cruz de El Seibo',
+	},
+	{
+		country_short: 'PE',
+		region: 'Pasco',
+		city: 'Yanahuanca',
+	},
+	{
+		country_short: 'CO',
+		region: 'Arauca',
+		city: 'Arauquita',
+	},
+	{
+		country_short: 'CO',
+		region: 'La Guajira',
+		city: 'Panama',
+	},
+	{
+		country_short: 'PY',
+		region: 'Concepcion',
+		city: 'Horqueta',
+	},
+	{
+		country_short: 'NI',
+		region: 'Costa Caribe Sur',
+		city: 'Bluefields',
+	},
+	{
+		country_short: 'AR',
+		region: 'Catamarca',
+		city: 'San Antonio',
+	},
+	{
+		country_short: 'BO',
+		region: 'El Beni',
+		city: 'La Santisima Trinidad',
+	},
+	{
+		country_short: 'GT',
+		region: 'Sacatepequez',
+		city: 'Antigua Guatemala',
+	},
+	{
+		country_short: 'TT',
+		region: 'Mayaro-Rio Claro',
+		city: 'Rio Claro',
+	},
+	{
+		country_short: 'VE',
+		region: 'Portuguesa',
+		city: 'Acarigua',
+	},
+	{
+		country_short: 'PE',
+		region: 'Lambayeque',
+		city: 'Chiclayo',
+	},
+	{
+		country_short: 'VE',
+		region: 'Yaracuy',
+		city: 'Yaritagua',
+	},
+	{
+		country_short: 'VE',
+		region: 'Merida',
+		city: 'Merida',
+	},
+	{
+		country_short: 'GT',
+		region: 'Suchitepequez',
+		city: 'Mazatenango',
+	},
+	{
+		country_short: 'VE',
+		region: 'Tachira',
+		city: 'San Cristobal',
+	},
+	{
+		country_short: 'PE',
+		region: 'Tacna',
+		city: 'Tacna',
+	},
+	{
+		country_short: 'EC',
+		region: 'Napo',
+		city: 'Tena',
+	},
+	{
+		country_short: 'CL',
+		region: 'Atacama',
+		city: 'Copiapo',
+	},
+	{
+		country_short: 'BO',
+		region: 'Pando',
+		city: 'Cobija',
+	},
+	{
+		country_short: 'CR',
+		region: 'Limon',
+		city: 'Cahuita',
+	},
+	{
+		country_short: 'PE',
+		region: 'Moquegua',
+		city: 'Torata',
+	},
+	{
+		country_short: 'PY',
+		region: 'Boqueron',
+		city: 'Filadelfia',
+	},
+	{
+		country_short: 'PE',
+		region: 'Madre de Dios',
+		city: 'Puerto Maldonado',
+	},
+	{
+		country_short: 'DO',
+		region: 'Dajabon',
+		city: 'Loma de Cabrera',
+	},
+	{
+		country_short: 'BZ',
+		region: 'Corozal',
+		city: 'Corozal',
+	},
+	{
+		country_short: 'TT',
+		region: 'Penal-Debe',
+		city: 'Penal',
+	},
+	{
+		country_short: 'TT',
+		region: 'Princes Town',
+		city: 'Princes Town',
+	},
+	{
+		country_short: 'EC',
+		region: 'Pastaza',
+		city: 'Pichincha',
+	},
+	{
+		country_short: 'PA',
+		region: 'Los Santos',
+		city: 'Las Tablas',
+	},
+	{
+		country_short: 'NI',
+		region: 'Matagalpa',
+		city: 'Rio Blanco',
+	},
+	{
+		country_short: 'CL',
+		region: 'Magallanes',
+		city: 'Punta Arenas',
+	},
+	{
+		country_short: 'CL',
+		region: 'Aisen del General Carlos Ibanez del Campo',
+		city: 'El Carmen',
+	},
+	{
+		country_short: 'PH',
+		region: 'Dinagat Islands',
+		city: 'Arellano',
+	},
+	{
+		country_short: 'MM',
+		region: 'Tanintharyi',
+		city: 'Myeik',
+	},
+	{
+		country_short: 'IE',
+		region: 'Sligo',
+		city: 'Sligo',
+	},
+	{
+		country_short: 'IE',
+		region: 'Westmeath',
+		city: 'An Muileann gCearr',
+	},
+	{
+		country_short: 'BG',
+		region: 'Veliko Tarnovo',
+		city: 'Svishtov',
+	},
+	{
+		country_short: 'BG',
+		region: 'Silistra',
+		city: 'Dulovo',
+	},
+	{
+		country_short: 'BG',
+		region: 'Vidin',
+		city: 'Kula',
+	},
+	{
+		country_short: 'BG',
+		region: 'Razgrad',
+		city: 'Razgrad',
+	},
+	{
+		country_short: 'MT',
+		region: 'Fgura',
+		city: 'Fgura',
+	},
+	{
+		country_short: 'MT',
+		region: 'Zejtun',
+		city: 'Zejtun',
+	},
+	{
+		country_short: 'MT',
+		region: 'Marsaskala',
+		city: "Ta' Monita",
+	},
+	{
+		country_short: 'MT',
+		region: 'Paola',
+		city: 'Paola',
+	},
+	{
+		country_short: 'MT',
+		region: 'Ghaxaq',
+		city: 'Ghaxaq',
+	},
+	{
+		country_short: 'MT',
+		region: 'Siggiewi',
+		city: 'Siggiewi',
+	},
+	{
+		country_short: 'MT',
+		region: 'Mtarfa',
+		city: 'Imtarfa',
+	},
+	{
+		country_short: 'MT',
+		region: 'Isla',
+		city: 'Senglea',
+	},
+	{
+		country_short: 'MT',
+		region: 'Floriana',
+		city: 'Floriana',
+	},
+	{
+		country_short: 'MT',
+		region: "Saint Lucia's",
+		city: 'Santa Lucija',
+	},
+	{
+		country_short: 'MT',
+		region: 'Mellieha',
+		city: 'Mellieha',
+	},
+	{
+		country_short: 'MT',
+		region: 'Luqa',
+		city: 'Luqa',
+	},
+	{
+		country_short: 'MT',
+		region: 'Marsa',
+		city: 'Marsa',
+	},
+	{
+		country_short: 'MT',
+		region: "Saint Julian's",
+		city: 'San Giljan',
+	},
+	{
+		country_short: 'MT',
+		region: 'Tarxien',
+		city: 'Tarxien',
+	},
+	{
+		country_short: 'MT',
+		region: 'Santa Venera',
+		city: 'Santa Venera',
+	},
+	{
+		country_short: 'MT',
+		region: 'Zurrieq',
+		city: 'Zurrieq',
+	},
+	{
+		country_short: 'MT',
+		region: 'Naxxar',
+		city: 'Naxxar',
+	},
+	{
+		country_short: 'MT',
+		region: 'Mqabba',
+		city: 'Mqabba',
+	},
+	{
+		country_short: 'MT',
+		region: 'Gharghur',
+		city: 'Hal Gharghur',
+	},
+	{
+		country_short: 'MT',
+		region: 'Rabat Gozo',
+		city: 'Victoria',
+	},
+	{
+		country_short: 'CH',
+		region: 'Uri',
+		city: 'Andermatt',
+	},
+	{
+		country_short: 'SI',
+		region: 'Polzela',
+		city: 'Polzela',
+	},
+	{
+		country_short: 'LV',
+		region: 'Daugavpils',
+		city: 'Daugavpils',
+	},
+	{
+		country_short: 'LB',
+		region: 'Liban-Nord',
+		city: 'Bcharre',
+	},
+	{
+		country_short: 'TJ',
+		region: 'Nohiyahoi Tobei Jumhuri',
+		city: 'Obigarm',
+	},
+	{
+		country_short: 'SI',
+		region: 'Slovenj Gradec',
+		city: 'Slovenj Gradec',
+	},
+	{
+		country_short: 'LV',
+		region: 'Gulbenes novads',
+		city: 'Gulbene',
+	},
+	{
+		country_short: 'LV',
+		region: 'Ropazu novads',
+		city: 'Ulbroka',
+	},
+	{
+		country_short: 'MK',
+		region: 'Radovis',
+		city: 'Radovis',
+	},
+	{
+		country_short: 'ME',
+		region: 'Niksic',
+		city: 'Niksic',
+	},
+	{
+		country_short: 'BG',
+		region: 'Lovech',
+		city: 'Troyan',
+	},
+	{
+		country_short: 'LT',
+		region: 'Taurages apskritis',
+		city: 'Taurage',
+	},
+	{
+		country_short: 'RS',
+		region: 'Severnobanatski okrug',
+		city: 'Gornji Breg',
+	},
+	{
+		country_short: 'RS',
+		region: 'Zapadnobacki okrug',
+		city: 'Apatin',
+	},
+	{
+		country_short: 'BY',
+		region: "Mahilyowskaya voblasts'",
+		city: 'Mahilyow',
+	},
+	{
+		country_short: 'SI',
+		region: 'Brda',
+		city: 'Dobrovo',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sempeter-Vrtojba',
+		city: 'Sempeter pri Gorici',
+	},
+	{
+		country_short: 'SI',
+		region: 'Nova Gorica',
+		city: 'Nova Gorica',
+	},
+	{
+		country_short: 'MD',
+		region: 'Stefan Voda',
+		city: 'Stefan Voda',
+	},
+	{
+		country_short: 'MD',
+		region: 'Soroca',
+		city: 'Soroca',
+	},
+	{
+		country_short: 'MD',
+		region: 'Leova',
+		city: 'Iargara',
+	},
+	{
+		country_short: 'MD',
+		region: 'Calarasi',
+		city: 'Calarasi',
+	},
+	{
+		country_short: 'MD',
+		region: 'Basarabeasca',
+		city: 'Basarabeasca',
+	},
+	{
+		country_short: 'MD',
+		region: 'Dubasari',
+		city: 'Cocieri',
+	},
+	{
+		country_short: 'SY',
+		region: 'Al Hasakah',
+		city: 'Al Qamishli',
+	},
+	{
+		country_short: 'RO',
+		region: 'Satu Mare',
+		city: 'Satu Mare',
+	},
+	{
+		country_short: 'LV',
+		region: 'Ogres novads',
+		city: 'Jumprava',
+	},
+	{
+		country_short: 'LV',
+		region: 'Madonas novads',
+		city: 'Lubana',
+	},
+	{
+		country_short: 'LV',
+		region: 'Aizkraukles novads',
+		city: 'Jaunjelgava',
+	},
+	{
+		country_short: 'LV',
+		region: 'Jekabpils novads',
+		city: 'Jekabpils',
+	},
+	{
+		country_short: 'LV',
+		region: 'Marupes novads',
+		city: 'Pinki',
+	},
+	{
+		country_short: 'LV',
+		region: 'Olaines novads',
+		city: 'Olaine',
+	},
+	{
+		country_short: 'LV',
+		region: 'Jelgavas novads',
+		city: 'Jelgava',
+	},
+	{
+		country_short: 'LV',
+		region: 'Bauskas novads',
+		city: 'Iecava',
+	},
+	{
+		country_short: 'LV',
+		region: 'Dobeles novads',
+		city: 'Dobele',
+	},
+	{
+		country_short: 'LV',
+		region: 'Salaspils novads',
+		city: 'Salaspils',
+	},
+	{
+		country_short: 'LV',
+		region: 'Saldus novads',
+		city: 'Saldus',
+	},
+	{
+		country_short: 'LV',
+		region: 'Tukuma novads',
+		city: 'Tukums',
+	},
+	{
+		country_short: 'LV',
+		region: 'Jurmala',
+		city: 'Jurmala',
+	},
+	{
+		country_short: 'LV',
+		region: 'Jelgava',
+		city: 'Tireli',
+	},
+	{
+		country_short: 'LV',
+		region: 'Adazu novads',
+		city: 'Carnikava',
+	},
+	{
+		country_short: 'LV',
+		region: 'Siguldas novads',
+		city: 'Sigulda',
+	},
+	{
+		country_short: 'LV',
+		region: 'Talsu novads',
+		city: 'Stende',
+	},
+	{
+		country_short: 'LV',
+		region: 'Ventspils novads',
+		city: 'Ventspils',
+	},
+	{
+		country_short: 'LV',
+		region: 'Liepaja',
+		city: 'Liepaja',
+	},
+	{
+		country_short: 'LV',
+		region: 'Dienvidkurzemes novads',
+		city: 'Priekule',
+	},
+	{
+		country_short: 'LV',
+		region: 'Rezeknes novads',
+		city: 'Rezekne',
+	},
+	{
+		country_short: 'LV',
+		region: 'Cesu novads',
+		city: 'Cesis',
+	},
+	{
+		country_short: 'LV',
+		region: 'Valmieras novads',
+		city: 'Valmiera',
+	},
+	{
+		country_short: 'LV',
+		region: 'Smiltenes novads',
+		city: 'Smiltene',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kanal',
+		city: 'Kanal',
+	},
+	{
+		country_short: 'SI',
+		region: 'Destrnik',
+		city: 'Crna na Koroskem',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sentrupert',
+		city: 'Bistrica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Brezovica',
+		city: 'Brezovica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Skocjan',
+		city: 'Jelendol',
+	},
+	{
+		country_short: 'SI',
+		region: 'Trebnje',
+		city: 'Trebnje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Semic',
+		city: 'Semic',
+	},
+	{
+		country_short: 'SI',
+		region: 'Crensovci',
+		city: 'Crensovci',
+	},
+	{
+		country_short: 'CH',
+		region: 'Nidwalden',
+		city: 'Stans',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ljutomer',
+		city: 'Ljutomer',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sveti Tomaz',
+		city: 'Trnovci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Krizevci',
+		city: 'Gajsevci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ptuj',
+		city: 'Ptuj',
+	},
+	{
+		country_short: 'SI',
+		region: 'Dornava',
+		city: 'Cunkovci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Markovci',
+		city: 'Markovci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Vrhnika',
+		city: 'Vrhnika',
+	},
+	{
+		country_short: 'SI',
+		region: 'Krsko',
+		city: 'Krsko',
+	},
+	{
+		country_short: 'SI',
+		region: 'Zagorje ob Savi',
+		city: 'Zagorje ob Savi',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ajdovscina',
+		city: 'Beltinci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ormoz',
+		city: 'Ormoz',
+	},
+	{
+		country_short: 'ME',
+		region: 'Pljevlja',
+		city: 'Pljevlja',
+	},
+	{
+		country_short: 'ME',
+		region: 'Pluzine',
+		city: 'Pluzine',
+	},
+	{
+		country_short: 'ME',
+		region: 'Danilovgrad',
+		city: 'Danilovgrad',
+	},
+	{
+		country_short: 'ME',
+		region: 'Zabljak',
+		city: 'Zabljak',
+	},
+	{
+		country_short: 'YE',
+		region: 'Dhamar',
+		city: 'Zarajah',
+	},
+	{
+		country_short: 'YE',
+		region: "Ad Dali'",
+		city: 'Dhalie',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sevnica',
+		city: 'Sevnica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Radenci',
+		city: 'Radenci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ilirska Bistrica',
+		city: 'Ilirska Bistrica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Hrpelje-Kozina',
+		city: 'Tatre',
+	},
+	{
+		country_short: 'SI',
+		region: 'Duplek',
+		city: 'Metava',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kosanjevica na Krki',
+		city: 'Jablance',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sveti Jurij v Slovenskih goricah',
+		city: 'Zgornji Gasteraj',
+	},
+	{
+		country_short: 'SI',
+		region: 'Smarje pri Jelsah',
+		city: 'Sotensko pri Smarju',
+	},
+	{
+		country_short: 'SI',
+		region: 'Crnomelj',
+		city: 'Crnomelj',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sveta Trojica v Slovenskih goricah',
+		city: 'Nadbisec',
+	},
+	{
+		country_short: 'SI',
+		region: 'Smarjeske Toplice',
+		city: 'Smarjeta',
+	},
+	{
+		country_short: 'SI',
+		region: 'Bistrica ob Sotli',
+		city: 'Bistrica ob Sotli',
+	},
+	{
+		country_short: 'SI',
+		region: 'Smartno pri Litiji',
+		city: 'Vintarjevec',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sentilj',
+		city: 'Sentilj v Slovenskih goricah',
+	},
+	{
+		country_short: 'SI',
+		region: 'Brezice',
+		city: 'Brezice',
+	},
+	{
+		country_short: 'SI',
+		region: 'Vipava',
+		city: 'Vipava',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ziri',
+		city: 'Ziri',
+	},
+	{
+		country_short: 'AD',
+		region: 'Escaldes-Engordany',
+		city: 'Les Escaldes',
+	},
+	{
+		country_short: 'AD',
+		region: 'La Massana',
+		city: 'La Massana',
+	},
+	{
+		country_short: 'AD',
+		region: 'Encamp',
+		city: 'Pas de la Casa',
+	},
+	{
+		country_short: 'AD',
+		region: 'Canillo',
+		city: 'El Tarter',
+	},
+	{
+		country_short: 'SY',
+		region: 'Ar Raqqah',
+		city: 'As Sabkhah',
+	},
+	{
+		country_short: 'MK',
+		region: 'Probistip',
+		city: 'Probishtip',
+	},
+	{
+		country_short: 'MK',
+		region: 'Sveti Nikole',
+		city: 'Sveti Nikole',
+	},
+	{
+		country_short: 'MK',
+		region: 'Novo Selo',
+		city: 'Novo Selo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Bosilovo',
+		city: 'Bosilovo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Valandovo',
+		city: 'Valandovo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Gevgelija',
+		city: 'Gevgelija',
+	},
+	{
+		country_short: 'MK',
+		region: 'Pehcevo',
+		city: 'Pehcevo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Berovo',
+		city: 'Berovo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Prilep',
+		city: 'Prilep',
+	},
+	{
+		country_short: 'MK',
+		region: 'Gostivar',
+		city: 'Chegrane',
+	},
+	{
+		country_short: 'MK',
+		region: 'Tearce',
+		city: 'Slatino',
+	},
+	{
+		country_short: 'MK',
+		region: 'Butel',
+		city: 'Radishani',
+	},
+	{
+		country_short: 'MK',
+		region: 'Resen',
+		city: 'Grncari',
+	},
+	{
+		country_short: 'MK',
+		region: 'Gazi Baba',
+		city: 'Creshevo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Mavrovo i Rostusa',
+		city: 'Rostusha',
+	},
+	{
+		country_short: 'MK',
+		region: 'Studenicani',
+		city: 'Studenichani',
+	},
+	{
+		country_short: 'MK',
+		region: 'Zelino',
+		city: 'Larce',
+	},
+	{
+		country_short: 'MK',
+		region: 'Stip',
+		city: 'Shtip',
+	},
+	{
+		country_short: 'MK',
+		region: 'Kicevo',
+		city: 'Zajas',
+	},
+	{
+		country_short: 'LU',
+		region: 'Mersch',
+		city: 'Bissen',
+	},
+	{
+		country_short: 'FO',
+		region: 'Eysturoy',
+		city: 'Fuglafjordur',
+	},
+	{
+		country_short: 'SI',
+		region: 'Store',
+		city: 'Store',
+	},
+	{
+		country_short: 'SI',
+		region: 'Cerklje na Gorenjskem',
+		city: 'Zgornji Brnik',
+	},
+	{
+		country_short: 'SI',
+		region: 'Dobrepolje',
+		city: 'Cesta',
+	},
+	{
+		country_short: 'AL',
+		region: 'Fier',
+		city: 'Fier',
+	},
+	{
+		country_short: 'IE',
+		region: 'Monaghan',
+		city: 'Monaghan',
+	},
+	{
+		country_short: 'IN',
+		region: 'Andaman and Nicobar Islands',
+		city: 'Port Blair',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Nelson',
+		city: 'Nelson',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Marlborough',
+		city: 'Blenheim',
+	},
+	{
+		country_short: 'NP',
+		region: 'Dhawalagiri',
+		city: 'Chitre',
+	},
+	{
+		country_short: 'GU',
+		region: 'Tamuning-Tumon-Harmon',
+		city: 'Tamuning-Tumon-Harmon Village',
+	},
+	{
+		country_short: 'PH',
+		region: 'Romblon',
+		city: 'Odiongan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Masbate',
+		city: 'Mobo',
+	},
+	{
+		country_short: 'PH',
+		region: 'Marinduque',
+		city: 'Tigui',
+	},
+	{
+		country_short: 'PH',
+		region: 'Catanduanes',
+		city: 'Calatagan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Southern Leyte',
+		city: 'Ibarra',
+	},
+	{
+		country_short: 'PH',
+		region: 'Sultan Kudarat',
+		city: 'Tacurong',
+	},
+	{
+		country_short: 'PH',
+		region: 'South Cotabato',
+		city: 'Glamang',
+	},
+	{
+		country_short: 'PH',
+		region: 'Surigao del Norte',
+		city: 'Mabua',
+	},
+	{
+		country_short: 'PH',
+		region: 'Maguindanao',
+		city: 'Sultan Kudarat',
+	},
+	{
+		country_short: 'PH',
+		region: 'Northern Samar',
+		city: 'Catarman',
+	},
+	{
+		country_short: 'PH',
+		region: 'Eastern Samar',
+		city: 'Dolores',
+	},
+	{
+		country_short: 'PH',
+		region: 'Davao Oriental',
+		city: 'Sigaboy',
+	},
+	{
+		country_short: 'PH',
+		region: 'Sarangani',
+		city: 'Camasi',
+	},
+	{
+		country_short: 'PH',
+		region: 'Camiguin',
+		city: 'Pandan',
+	},
+	{
+		country_short: 'PH',
+		region: 'La Union',
+		city: 'Acao',
+	},
+	{
+		country_short: 'PH',
+		region: 'Ilocos Sur',
+		city: 'Vigan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Ifugao',
+		city: 'Potia',
+	},
+	{
+		country_short: 'PH',
+		region: 'Mountain Province',
+		city: 'Bontoc',
+	},
+	{
+		country_short: 'PH',
+		region: 'Ilocos Norte',
+		city: 'Baay',
+	},
+	{
+		country_short: 'PH',
+		region: 'Kalinga',
+		city: 'Laya',
+	},
+	{
+		country_short: 'PH',
+		region: 'Abra',
+		city: 'Bangued',
+	},
+	{
+		country_short: 'PH',
+		region: 'Nueva Vizcaya',
+		city: 'Bayombong',
+	},
+	{
+		country_short: 'PH',
+		region: 'Quirino',
+		city: 'Cabarroguis',
+	},
+	{
+		country_short: 'NP',
+		region: 'Karnali',
+		city: 'Jumla',
+	},
+	{
+		country_short: 'CA',
+		region: 'Yukon',
+		city: 'Whitehorse',
+	},
+	{
+		country_short: 'CA',
+		region: 'Nunavut',
+		city: 'Iqaluit',
+	},
+	{
+		country_short: 'CA',
+		region: 'Northwest Territories',
+		city: 'Yellowknife',
+	},
+	{
+		country_short: 'KP',
+		region: "P'yongyang",
+		city: 'Pyongyang',
+	},
+	{
+		country_short: 'AW',
+		region: 'Aruba',
+		city: 'Oranjestad',
+	},
+	{
+		country_short: 'HT',
+		region: 'Ouest',
+		city: 'Port-au-Prince',
+	},
+	{
+		country_short: 'GY',
+		region: 'Demerara-Mahaica',
+		city: 'Georgetown',
+	},
+	{
+		country_short: 'ST',
+		region: 'Agua Grande',
+		city: 'Sao Tome',
+	},
+	{
+		country_short: 'ET',
+		region: 'Adis Abeba',
+		city: 'Addis Ababa',
+	},
+	{
+		country_short: 'ER',
+		region: 'Al Awsat',
+		city: 'Asmara',
+	},
+	{
+		country_short: 'GW',
+		region: 'Bissau',
+		city: 'Bissau',
+	},
+	{
+		country_short: 'PH',
+		region: 'Guimaras',
+		city: 'South Valencia',
+	},
+	{
+		country_short: 'PH',
+		region: 'Aurora',
+		city: 'Baler',
+	},
+	{
+		country_short: 'PH',
+		region: 'Samar',
+		city: 'Gandara',
+	},
+	{
+		country_short: 'PH',
+		region: 'Siquijor',
+		city: 'Maria',
+	},
+	{
+		country_short: 'AF',
+		region: 'Daykundi',
+		city: 'Mazar',
+	},
+	{
+		country_short: 'AF',
+		region: 'Kandahar',
+		city: 'Kandahar',
+	},
+	{
+		country_short: 'AF',
+		region: 'Nangarhar',
+		city: 'Jalalabad',
+	},
+	{
+		country_short: 'AF',
+		region: 'Balkh',
+		city: 'Mazar-e Sharif',
+	},
+	{
+		country_short: 'AF',
+		region: 'Khost',
+		city: 'Khost',
+	},
+	{
+		country_short: 'AF',
+		region: 'Nimroz',
+		city: 'Zaranj',
+	},
+	{
+		country_short: 'MN',
+		region: 'Govi-Altay',
+		city: 'Bayangol',
+	},
+	{
+		country_short: 'MN',
+		region: 'Orhon',
+		city: 'Erdenet',
+	},
+	{
+		country_short: 'AF',
+		region: 'Faryab',
+		city: 'Maymana',
+	},
+	{
+		country_short: 'AF',
+		region: 'Laghman',
+		city: 'Mehtar Lam',
+	},
+	{
+		country_short: 'BN',
+		region: 'Belait',
+		city: 'Kuala Belait',
+	},
+	{
+		country_short: 'BN',
+		region: 'Tutong',
+		city: 'Tutong',
+	},
+	{
+		country_short: 'SL',
+		region: 'Eastern',
+		city: 'Daru',
+	},
+	{
+		country_short: 'TW',
+		region: 'Lienchiang',
+		city: 'Nangan',
+	},
+	{
+		country_short: 'LK',
+		region: 'Uva Province',
+		city: 'Haputale',
+	},
+	{
+		country_short: 'LK',
+		region: 'Northern Province',
+		city: 'Jaffna',
+	},
+	{
+		country_short: 'LK',
+		region: 'Sabaragamuwa Province',
+		city: 'Ratnapura',
+	},
+	{
+		country_short: 'LV',
+		region: 'Aluksnes novads',
+		city: 'Aluksne',
+	},
+	{
+		country_short: 'LV',
+		region: 'Ludzas novads',
+		city: 'Ludza',
+	},
+	{
+		country_short: 'EE',
+		region: 'Vorumaa',
+		city: 'Voru',
+	},
+	{
+		country_short: 'EE',
+		region: 'Laane-Virumaa',
+		city: 'Tapa',
+	},
+	{
+		country_short: 'MC',
+		region: 'Monte-Carlo',
+		city: 'Monte-Carlo',
+	},
+	{
+		country_short: 'SI',
+		region: 'Rogaska Slatina',
+		city: 'Rogaska Slatina',
+	},
+	{
+		country_short: 'SI',
+		region: 'Hrastnik',
+		city: 'Hrastnik',
+	},
+	{
+		country_short: 'SI',
+		region: 'Velike Lasce',
+		city: 'Laze',
+	},
+	{
+		country_short: 'LV',
+		region: 'Limbazu novads',
+		city: 'Limbazi',
+	},
+	{
+		country_short: 'TJ',
+		region: 'Khatlon',
+		city: 'Kuybishevsk',
+	},
+	{
+		country_short: 'MK',
+		region: 'Petrovec',
+		city: 'Sredno Konjari',
+	},
+	{
+		country_short: 'MK',
+		region: 'Ilinden',
+		city: 'Kadino',
+	},
+	{
+		country_short: 'MK',
+		region: 'Vinica',
+		city: 'Vinica',
+	},
+	{
+		country_short: 'MK',
+		region: 'Makedonski Brod',
+		city: 'Makedonski Brod',
+	},
+	{
+		country_short: 'MK',
+		region: 'Negotino',
+		city: 'Negotino',
+	},
+	{
+		country_short: 'MX',
+		region: 'Colima',
+		city: 'Madrid',
+	},
+	{
+		country_short: 'MT',
+		region: 'Pembroke',
+		city: 'Sprachcaffe',
+	},
+	{
+		country_short: 'RS',
+		region: 'Kolubarski okrug',
+		city: 'Osecina',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Xorazm',
+		city: 'Urganch',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Samkir',
+		city: 'Shamkhor',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Agdas',
+		city: 'Agdas',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Sirvan',
+		city: 'Sirvan',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Lankaran',
+		city: 'Lankaran',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Imisli',
+		city: 'Imishli',
+	},
+	{
+		country_short: 'MD',
+		region: 'Soldanesti',
+		city: 'Soldanesti',
+	},
+	{
+		country_short: 'RS',
+		region: 'Srednjebanatski okrug',
+		city: 'Ecka',
+	},
+	{
+		country_short: 'LY',
+		region: 'An Nuqat al Khams',
+		city: 'Zuwarah',
+	},
+	{
+		country_short: 'TR',
+		region: 'Tunceli',
+		city: 'Isitma',
+	},
+	{
+		country_short: 'GU',
+		region: 'Mangilao',
+		city: 'Mangilao Village',
+	},
+	{
+		country_short: 'JM',
+		region: 'Saint Catherine',
+		city: 'Old Harbour Bay',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint Thomas',
+		city: 'Lears',
+	},
+	{
+		country_short: 'JM',
+		region: 'Trelawny',
+		city: 'Wakefield',
+	},
+	{
+		country_short: 'JM',
+		region: 'Portland',
+		city: 'Port Antonio',
+	},
+	{
+		country_short: 'AG',
+		region: 'Saint George',
+		city: 'Cassada Gardens',
+	},
+	{
+		country_short: 'JM',
+		region: 'Hanover',
+		city: 'Lucea',
+	},
+	{
+		country_short: 'JM',
+		region: 'Saint Mary',
+		city: 'Richmond',
+	},
+	{
+		country_short: 'JM',
+		region: 'Saint Andrew',
+		city: 'Stony Hill',
+	},
+	{
+		country_short: 'JM',
+		region: 'Clarendon',
+		city: 'Chapelton',
+	},
+	{
+		country_short: 'JM',
+		region: 'Saint Ann',
+		city: 'Ocho Rios',
+	},
+	{
+		country_short: 'JM',
+		region: 'Westmoreland',
+		city: 'Negril',
+	},
+	{
+		country_short: 'YE',
+		region: 'Lahij',
+		city: 'Al Milah',
+	},
+	{
+		country_short: 'HN',
+		region: 'Olancho',
+		city: 'Juticalpa',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint Philip',
+		city: 'Saint Martins',
+	},
+	{
+		country_short: 'TT',
+		region: 'Tunapuna-Piarco',
+		city: 'Arouca',
+	},
+	{
+		country_short: 'DO',
+		region: 'Azua',
+		city: 'Azua',
+	},
+	{
+		country_short: 'DO',
+		region: 'San Juan',
+		city: 'San Pedro',
+	},
+	{
+		country_short: 'DO',
+		region: 'Baoruco',
+		city: 'El Palmar',
+	},
+	{
+		country_short: 'DO',
+		region: 'Hato Mayor',
+		city: 'El Valle',
+	},
+	{
+		country_short: 'DO',
+		region: 'Duarte',
+		city: 'San Francisco de Macoris',
+	},
+	{
+		country_short: 'DO',
+		region: 'Monte Cristi',
+		city: 'Villa Elisa',
+	},
+	{
+		country_short: 'BV',
+		region: 'Bouvet Island',
+		city: 'Bouvet Island',
+	},
+	{
+		country_short: 'PW',
+		region: 'Koror',
+		city: 'Koror',
+	},
+	{
+		country_short: 'PE',
+		region: 'Ancash',
+		city: 'Chimbote',
+	},
+	{
+		country_short: 'BB',
+		region: 'Christ Church',
+		city: 'Oistins',
+	},
+	{
+		country_short: 'BM',
+		region: 'Saint George',
+		city: 'Saint George',
+	},
+	{
+		country_short: 'BS',
+		region: 'East Grand Bahama',
+		city: 'High Rock',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint George',
+		city: 'Dash Valley',
+	},
+	{
+		country_short: 'MM',
+		region: 'Mon',
+		city: 'Kyaikkami',
+	},
+	{
+		country_short: 'MM',
+		region: 'Kayin',
+		city: 'Hpa-An',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint James',
+		city: 'Holetown',
+	},
+	{
+		country_short: 'GD',
+		region: 'Saint Andrew',
+		city: 'Grenville',
+	},
+	{
+		country_short: 'GD',
+		region: 'Southern Grenadine Islands',
+		city: 'Hillsborough',
+	},
+	{
+		country_short: 'GD',
+		region: 'Saint David',
+		city: "Saint David's",
+	},
+	{
+		country_short: 'VC',
+		region: 'Grenadines',
+		city: 'Charlestown',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint Lucy',
+		city: 'Benthams',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint Andrew',
+		city: 'Shorey',
+	},
+	{
+		country_short: 'GD',
+		region: 'Saint John',
+		city: 'Gouyave',
+	},
+	{
+		country_short: 'GD',
+		region: 'Saint Mark',
+		city: 'Victoria',
+	},
+	{
+		country_short: 'LC',
+		region: 'Soufriere',
+		city: 'Soufriere',
+	},
+	{
+		country_short: 'BS',
+		region: 'Black Point',
+		city: 'Black Point',
+	},
+	{
+		country_short: 'JM',
+		region: 'Manchester',
+		city: 'Mandeville',
+	},
+	{
+		country_short: 'BS',
+		region: 'Long Island',
+		city: 'Clarence Town',
+	},
+	{
+		country_short: 'DO',
+		region: 'Barahona',
+		city: 'Santa Cruz de Barahona',
+	},
+	{
+		country_short: 'DO',
+		region: 'Independencia',
+		city: 'Cristobal',
+	},
+	{
+		country_short: 'JM',
+		region: 'Saint Elizabeth',
+		city: 'Nain',
+	},
+	{
+		country_short: 'MT',
+		region: 'Nadur',
+		city: 'Nadur',
+	},
+	{
+		country_short: 'MT',
+		region: 'Hamrun',
+		city: 'Hamrun',
+	},
+	{
+		country_short: 'MT',
+		region: 'Safi',
+		city: 'Safi',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint Paul',
+		city: 'Mahaut',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint Peter',
+		city: 'Bioche',
+	},
+	{
+		country_short: 'MS',
+		region: 'Saint Peter',
+		city: 'Brades',
+	},
+	{
+		country_short: 'AG',
+		region: 'Saint Mary',
+		city: 'Old Road',
+	},
+	{
+		country_short: 'LC',
+		region: 'Vieux Fort',
+		city: 'Vieux Fort',
+	},
+	{
+		country_short: 'AG',
+		region: 'Saint Philip',
+		city: 'Willoughby',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint Luke',
+		city: 'Pointe Michel',
+	},
+	{
+		country_short: 'AG',
+		region: 'Saint Peter',
+		city: 'Parham',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint Mary Cayon',
+		city: 'Dalzells',
+	},
+	{
+		country_short: 'SZ',
+		region: 'Lubombo',
+		city: 'Siteki',
+	},
+	{
+		country_short: 'VC',
+		region: 'Saint Patrick',
+		city: 'Rutland Vale',
+	},
+	{
+		country_short: 'VC',
+		region: 'Charlotte',
+		city: 'Georgetown',
+	},
+	{
+		country_short: 'BB',
+		region: 'Saint Peter',
+		city: 'Speightstown',
+	},
+	{
+		country_short: 'LC',
+		region: 'Choiseul',
+		city: 'La Fargue',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint Patrick',
+		city: 'La Plaine',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint Andrew',
+		city: 'Marigot',
+	},
+	{
+		country_short: 'MV',
+		region: 'South Thiladhunmathi',
+		city: 'Kulhudhuffushi',
+	},
+	{
+		country_short: 'MV',
+		region: 'North Maalhosmadulu',
+		city: 'Ugoofaaru',
+	},
+	{
+		country_short: 'NI',
+		region: 'Granada',
+		city: 'Granada',
+	},
+	{
+		country_short: 'JM',
+		region: 'Saint Thomas',
+		city: 'Easington',
+	},
+	{
+		country_short: 'GD',
+		region: 'Saint Patrick',
+		city: 'Sauteurs',
+	},
+	{
+		country_short: 'AF',
+		region: 'Bamyan',
+		city: 'Panjab',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint Thomas Middle Island',
+		city: 'Half Way Tree',
+	},
+	{
+		country_short: 'KN',
+		region: 'Christ Church Nichola Town',
+		city: 'Mansion',
+	},
+	{
+		country_short: 'AG',
+		region: 'Redonda',
+		city: 'Redonda',
+	},
+	{
+		country_short: 'MK',
+		region: 'Kocani',
+		city: 'Kochani',
+	},
+	{
+		country_short: 'MK',
+		region: 'Jegunovce',
+		city: 'Vratnica',
+	},
+	{
+		country_short: 'MK',
+		region: 'Makedonska Kamenica',
+		city: 'Makedonska Kamenica',
+	},
+	{
+		country_short: 'MK',
+		region: 'Lozovo',
+		city: 'Lozovo',
+	},
+	{
+		country_short: 'MK',
+		region: 'Caska',
+		city: 'Bogomila',
+	},
+	{
+		country_short: 'MK',
+		region: 'Rosoman',
+		city: 'Rosoman',
+	},
+	{
+		country_short: 'MK',
+		region: 'Gradsko',
+		city: 'Gradsko',
+	},
+	{
+		country_short: 'MK',
+		region: 'Dojran',
+		city: 'Star Dojran',
+	},
+	{
+		country_short: 'MK',
+		region: 'Vevcani',
+		city: 'Oktisi',
+	},
+	{
+		country_short: 'MK',
+		region: 'Kriva Palanka',
+		city: 'Kriva Palanka',
+	},
+	{
+		country_short: 'MK',
+		region: 'Karbinci',
+		city: 'Karbinci',
+	},
+	{
+		country_short: 'MK',
+		region: 'Zelenikovo',
+		city: 'Zelenikovo',
+	},
+	{
+		country_short: 'SI',
+		region: 'Vojnik',
+		city: 'Vojnik',
+	},
+	{
+		country_short: 'SI',
+		region: 'Lasko',
+		city: 'Lasko',
+	},
+	{
+		country_short: 'SI',
+		region: 'Prevalje',
+		city: 'Prevalje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sentjur',
+		city: 'Sentjur',
+	},
+	{
+		country_short: 'SI',
+		region: 'Podcetrtek',
+		city: 'Pristava pri Mestinju',
+	},
+	{
+		country_short: 'SI',
+		region: 'Recica ob Savinji',
+		city: 'Spodnja Recica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Dobrna',
+		city: 'Dobrna',
+	},
+	{
+		country_short: 'SI',
+		region: 'Mozirje',
+		city: 'Mozirje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Braslovce',
+		city: 'Kamence',
+	},
+	{
+		country_short: 'SI',
+		region: 'Smartno ob Paki',
+		city: 'Smartno ob Paki',
+	},
+	{
+		country_short: 'LB',
+		region: 'Liban-Sud',
+		city: 'Sidon',
+	},
+	{
+		country_short: 'RS',
+		region: 'Branicevski okrug',
+		city: 'Milanovac',
+	},
+	{
+		country_short: 'SS',
+		region: 'Northern Bahr el Ghazal',
+		city: 'Aweil',
+	},
+	{
+		country_short: 'TF',
+		region: 'French Southern Territories',
+		city: 'Port-aux-Francais',
+	},
+	{
+		country_short: 'BF',
+		region: 'Tuy',
+		city: 'Hounde',
+	},
+	{
+		country_short: 'CD',
+		region: 'Nord-Kivu',
+		city: 'Beni',
+	},
+	{
+		country_short: 'GN',
+		region: 'Siguiri',
+		city: 'Siguiri',
+	},
+	{
+		country_short: 'TM',
+		region: 'Balkan',
+		city: 'Turkmenistan',
+	},
+	{
+		country_short: 'CF',
+		region: 'Bamingui-Bangoran',
+		city: 'Ndele',
+	},
+	{
+		country_short: 'CF',
+		region: 'Nana-Mambere',
+		city: 'Bouar',
+	},
+	{
+		country_short: 'CF',
+		region: 'Ouham',
+		city: 'Bouca',
+	},
+	{
+		country_short: 'CF',
+		region: 'Ouham-Pende',
+		city: 'Paoua',
+	},
+	{
+		country_short: 'CF',
+		region: 'Gribingui',
+		city: 'Kaga Bandoro',
+	},
+	{
+		country_short: 'CF',
+		region: 'Kemo-Gribingui',
+		city: 'Dekoa',
+	},
+	{
+		country_short: 'NE',
+		region: 'Diffa',
+		city: 'Diffa',
+	},
+	{
+		country_short: 'NE',
+		region: 'Tillaberi',
+		city: 'Tillaberi',
+	},
+	{
+		country_short: 'LR',
+		region: 'Grand Gedeh',
+		city: 'Zwedru',
+	},
+	{
+		country_short: 'LR',
+		region: 'Sinoe',
+		city: 'Greenville',
+	},
+	{
+		country_short: 'SS',
+		region: 'Eastern Equatoria',
+		city: 'Torit',
+	},
+	{
+		country_short: 'SS',
+		region: 'Western Equatoria',
+		city: 'Yambio',
+	},
+	{
+		country_short: 'ML',
+		region: 'Tombouctou',
+		city: 'Niafunke',
+	},
+	{
+		country_short: 'ML',
+		region: 'Gao',
+		city: 'Ansongo',
+	},
+	{
+		country_short: 'BF',
+		region: 'Tapoa',
+		city: 'Diapaga',
+	},
+	{
+		country_short: 'ML',
+		region: 'Kidal',
+		city: 'Kidal',
+	},
+	{
+		country_short: 'PG',
+		region: 'Southern Highlands',
+		city: 'Mendi',
+	},
+	{
+		country_short: 'MT',
+		region: 'Xaghra',
+		city: 'Xaghra',
+	},
+	{
+		country_short: 'MT',
+		region: 'Munxar',
+		city: 'Xlendi',
+	},
+	{
+		country_short: 'MT',
+		region: 'Fontana',
+		city: 'Manresa',
+	},
+	{
+		country_short: 'MT',
+		region: 'Ghasri',
+		city: 'Ghasri',
+	},
+	{
+		country_short: 'MT',
+		region: 'Qala',
+		city: 'Qala',
+	},
+	{
+		country_short: 'MT',
+		region: 'Xewkija',
+		city: 'Xewkija',
+	},
+	{
+		country_short: 'BO',
+		region: 'Oruro',
+		city: 'Challapata',
+	},
+	{
+		country_short: 'RU',
+		region: 'Ingushetiya, Respublika',
+		city: 'Ingushetiya, Respublika',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ribnica',
+		city: 'Ribnica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sezana',
+		city: 'Sezana',
+	},
+	{
+		country_short: 'SI',
+		region: 'Moravce',
+		city: 'Negastrn',
+	},
+	{
+		country_short: 'SI',
+		region: 'Metlika',
+		city: 'Metlika',
+	},
+	{
+		country_short: 'SI',
+		region: 'Lukovica',
+		city: 'Kompolje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Mezica',
+		city: 'Mezica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Apace',
+		city: 'Sladki Vrh',
+	},
+	{
+		country_short: 'LV',
+		region: 'Saulkrastu novads',
+		city: 'Zvejniekciems',
+	},
+	{
+		country_short: 'LV',
+		region: 'Balvu novads',
+		city: 'Balvi',
+	},
+	{
+		country_short: 'AL',
+		region: 'Berat',
+		city: 'Berat',
+	},
+	{
+		country_short: 'AL',
+		region: 'Shkoder',
+		city: 'Shkoder',
+	},
+	{
+		country_short: 'MT',
+		region: 'Gharb',
+		city: 'Birbuba',
+	},
+	{
+		country_short: 'MT',
+		region: 'Kercem',
+		city: 'Kercem',
+	},
+	{
+		country_short: 'MT',
+		region: 'Kalkara',
+		city: 'Kalkara',
+	},
+	{
+		country_short: 'EE',
+		region: 'Jarvamaa',
+		city: 'Koeru',
+	},
+	{
+		country_short: 'EE',
+		region: 'Raplamaa',
+		city: 'Rapla',
+	},
+	{
+		country_short: 'LV',
+		region: 'Kraslavas novads',
+		city: 'Kraslava',
+	},
+	{
+		country_short: 'RU',
+		region: 'Nenetskiy avtonomnyy okrug',
+		city: "Nar'yan-Mar",
+	},
+	{
+		country_short: 'LV',
+		region: 'Livanu novads',
+		city: 'Silavas',
+	},
+	{
+		country_short: 'MT',
+		region: 'Gudja',
+		city: 'Gudja',
+	},
+	{
+		country_short: 'MT',
+		region: 'Ghajnsielem',
+		city: 'Mgarr',
+	},
+	{
+		country_short: 'LU',
+		region: 'Diekirch',
+		city: 'Diekirch',
+	},
+	{
+		country_short: 'LU',
+		region: 'Redange',
+		city: 'Redange-sur-Attert',
+	},
+	{
+		country_short: 'LU',
+		region: 'Capellen',
+		city: 'Koerich',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sentjernej',
+		city: 'Groblje pri Prekopi',
+	},
+	{
+		country_short: 'SI',
+		region: 'Trzic',
+		city: 'Trzic',
+	},
+	{
+		country_short: 'ME',
+		region: 'Andrijevica',
+		city: 'Andrijevica',
+	},
+	{
+		country_short: 'MK',
+		region: 'Cesinovo-Oblesevo',
+		city: 'Obleshevo',
+	},
+	{
+		country_short: 'TR',
+		region: 'Igdir',
+		city: 'Igdir',
+	},
+	{
+		country_short: 'AL',
+		region: 'Gjirokaster',
+		city: 'Gjirokaster',
+	},
+	{
+		country_short: 'AL',
+		region: 'Kukes',
+		city: 'Kukes',
+	},
+	{
+		country_short: 'AL',
+		region: 'Korce',
+		city: 'Korce',
+	},
+	{
+		country_short: 'MK',
+		region: 'Rankovce',
+		city: 'Rankovce',
+	},
+	{
+		country_short: 'MK',
+		region: 'Bogdanci',
+		city: 'Bogdanci',
+	},
+	{
+		country_short: 'MK',
+		region: 'Plasnica',
+		city: 'Lisicani',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Qax',
+		city: 'Qax',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Kurdamir',
+		city: 'Ucarli',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Tartar',
+		city: 'Terter',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Yevlax',
+		city: 'Yevlakh',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Naftalan',
+		city: 'Naftalan',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Ismayilli',
+		city: 'Basqal',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Xizi',
+		city: 'Altiagac',
+	},
+	{
+		country_short: 'LI',
+		region: 'Triesenberg',
+		city: 'Triesenberg',
+	},
+	{
+		country_short: 'GE',
+		region: "Rach'a-Lechkhumi-Kvemo Svaneti",
+		city: 'Oni',
+	},
+	{
+		country_short: 'MC',
+		region: 'La Condamine',
+		city: 'La Condamine',
+	},
+	{
+		country_short: 'MC',
+		region: 'Saint-Roman',
+		city: 'Saint-Roman',
+	},
+	{
+		country_short: 'LV',
+		region: 'Valkas novads',
+		city: 'Valka',
+	},
+	{
+		country_short: 'MT',
+		region: 'Xghajra',
+		city: 'Xghajra',
+	},
+	{
+		country_short: 'SS',
+		region: 'Upper Nile',
+		city: 'Malakal',
+	},
+	{
+		country_short: 'IS',
+		region: 'Vesturland',
+		city: 'Borgarnes',
+	},
+	{
+		country_short: 'FO',
+		region: 'Suduroy',
+		city: 'Vagur',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Oguz',
+		city: 'Oguz',
+	},
+	{
+		country_short: 'FO',
+		region: 'Nordoyar',
+		city: 'Klaksvik',
+	},
+	{
+		country_short: 'GR',
+		region: 'Agion Oros',
+		city: 'Karyes',
+	},
+	{
+		country_short: 'YE',
+		region: 'Al Jawf',
+		city: 'Al Hazm',
+	},
+	{
+		country_short: 'IS',
+		region: 'Vestfirdir',
+		city: 'Isafjoerdur',
+	},
+	{
+		country_short: 'SI',
+		region: 'Hoce-Slivnica',
+		city: 'Rogoza',
+	},
+	{
+		country_short: 'SI',
+		region: 'Videm',
+		city: 'Sela',
+	},
+	{
+		country_short: 'SI',
+		region: 'Slovenska Bistrica',
+		city: 'Slovenska Bistrica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Hajdina',
+		city: 'Spodnja Hajdina',
+	},
+	{
+		country_short: 'SI',
+		region: 'Preddvor',
+		city: 'Preddvor',
+	},
+	{
+		country_short: 'SI',
+		region: 'Menges',
+		city: 'Menges',
+	},
+	{
+		country_short: 'SI',
+		region: 'Poljcane',
+		city: 'Poljcane',
+	},
+	{
+		country_short: 'SI',
+		region: 'Medvode',
+		city: 'Medvode',
+	},
+	{
+		country_short: 'AX',
+		region: 'Finstroem',
+		city: 'Finstrom',
+	},
+	{
+		country_short: 'AX',
+		region: 'Sund',
+		city: 'Sund',
+	},
+	{
+		country_short: 'MK',
+		region: 'Lipkovo',
+		city: 'Otlja',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Andijon',
+		city: 'Andijon',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Navoiy',
+		city: 'Tomdibuloq',
+	},
+	{
+		country_short: 'LU',
+		region: 'Clervaux',
+		city: 'Clervaux',
+	},
+	{
+		country_short: 'LU',
+		region: 'Echternach',
+		city: 'Echternach',
+	},
+	{
+		country_short: 'LU',
+		region: 'Remich',
+		city: 'Remich',
+	},
+	{
+		country_short: 'EE',
+		region: 'Saaremaa',
+		city: 'Kuressaare',
+	},
+	{
+		country_short: 'EE',
+		region: 'Valgamaa',
+		city: 'Valga',
+	},
+	{
+		country_short: 'EE',
+		region: 'Polvamaa',
+		city: 'Polva',
+	},
+	{
+		country_short: 'TD',
+		region: 'Ouaddai',
+		city: 'Abeche',
+	},
+	{
+		country_short: 'GN',
+		region: 'Kankan',
+		city: 'Kankan',
+	},
+	{
+		country_short: 'BN',
+		region: 'Temburong',
+		city: 'Bangar',
+	},
+	{
+		country_short: 'SI',
+		region: 'Gornja Radgona',
+		city: 'Gornja Radgona',
+	},
+	{
+		country_short: 'SI',
+		region: 'Cerknica',
+		city: 'Cerknica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Loska dolina',
+		city: 'Klance',
+	},
+	{
+		country_short: 'SI',
+		region: 'Vransko',
+		city: 'Vransko',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sencur',
+		city: 'Sencur',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Surxondaryo',
+		city: 'Tirmiz',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Namangan',
+		city: 'Turagurghon',
+	},
+	{
+		country_short: 'UZ',
+		region: "Qoraqalpog'iston Respublikasi",
+		city: "Mang'it Shahri",
+	},
+	{
+		country_short: 'CG',
+		region: 'Cuvette',
+		city: 'Owando',
+	},
+	{
+		country_short: 'MT',
+		region: 'Iklin',
+		city: 'L-Iklin',
+	},
+	{
+		country_short: 'SI',
+		region: 'Lovrenc na Pohorju',
+		city: 'Lovrenc na Pohorju',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ivancna Gorica',
+		city: 'Vir pri Sticni',
+	},
+	{
+		country_short: 'SI',
+		region: 'Idrija',
+		city: 'Idrija',
+	},
+	{
+		country_short: 'TJ',
+		region: 'Kuhistoni Badakhshon',
+		city: 'Khorugh',
+	},
+	{
+		country_short: 'SI',
+		region: 'Zelezniki',
+		city: 'Zelezniki',
+	},
+	{
+		country_short: 'LU',
+		region: 'Vianden',
+		city: 'Tandel',
+	},
+	{
+		country_short: 'AD',
+		region: 'Sant Julia de Loria',
+		city: 'Sant Julia de Loria',
+	},
+	{
+		country_short: 'AD',
+		region: 'Ordino',
+		city: 'Ordino',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Zardab',
+		city: 'Zardob',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Balakan',
+		city: 'Belokany',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Samaxi',
+		city: 'Shamakhi',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Qabala',
+		city: 'Qutqashen',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Neftcala',
+		city: 'Neftcala',
+	},
+	{
+		country_short: 'MT',
+		region: 'Kirkop',
+		city: 'Kirkop',
+	},
+	{
+		country_short: 'SI',
+		region: 'Race-Fram',
+		city: 'Race',
+	},
+	{
+		country_short: 'SI',
+		region: 'Makole',
+		city: 'Loznica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Razkrizje',
+		city: 'Gibina',
+	},
+	{
+		country_short: 'SI',
+		region: 'Miklavz na Dravskem polju',
+		city: 'Miklavz na Dravskem Polju',
+	},
+	{
+		country_short: 'SI',
+		region: 'Lenart',
+		city: 'Lenart v Slovenskih Goricah',
+	},
+	{
+		country_short: 'LV',
+		region: 'Varaklanu novads',
+		city: 'Varaklani',
+	},
+	{
+		country_short: 'MD',
+		region: 'Falesti',
+		city: 'Falesti',
+	},
+	{
+		country_short: 'GL',
+		region: 'Kommune Kujalleq',
+		city: 'Qaqortoq',
+	},
+	{
+		country_short: 'GL',
+		region: 'Kommune Qeqertalik',
+		city: 'Qasigiannguit',
+	},
+	{
+		country_short: 'FO',
+		region: 'Vagar',
+		city: 'Sorvagur',
+	},
+	{
+		country_short: 'MK',
+		region: 'Novaci',
+		city: 'Novaci',
+	},
+	{
+		country_short: 'SJ',
+		region: 'Svalbard and Jan Mayen',
+		city: 'Longyearbyen',
+	},
+	{
+		country_short: 'SI',
+		region: 'Komen',
+		city: 'Stanjel',
+	},
+	{
+		country_short: 'SI',
+		region: 'Starse',
+		city: 'Loka',
+	},
+	{
+		country_short: 'SI',
+		region: 'Tabor',
+		city: 'Kapla',
+	},
+	{
+		country_short: 'SI',
+		region: 'Benedikt',
+		city: 'Benedikt',
+	},
+	{
+		country_short: 'SI',
+		region: 'Verzej',
+		city: 'Verzej',
+	},
+	{
+		country_short: 'SI',
+		region: 'Jursinci',
+		city: 'Jursinci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Borovnica',
+		city: 'Borovnica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Bovec',
+		city: 'Bovec',
+	},
+	{
+		country_short: 'SI',
+		region: 'Oplotnica',
+		city: 'Oplotnica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Velika Polana',
+		city: 'Velika Polana',
+	},
+	{
+		country_short: 'SI',
+		region: 'Dobje',
+		city: 'Dobje pri Planini',
+	},
+	{
+		country_short: 'SI',
+		region: 'Straza',
+		city: 'Straza',
+	},
+	{
+		country_short: 'SI',
+		region: 'Slovenske Konjice',
+		city: 'Slovenske Konjice',
+	},
+	{
+		country_short: 'MT',
+		region: 'Qrendi',
+		city: 'Qrendi',
+	},
+	{
+		country_short: 'MT',
+		region: 'Marsaxlokk',
+		city: 'Marsaxlokk',
+	},
+	{
+		country_short: 'MT',
+		region: 'Birgu',
+		city: 'Vittoriosa',
+	},
+	{
+		country_short: 'MC',
+		region: 'Fontvieille',
+		city: 'Fontvieille',
+	},
+	{
+		country_short: 'MC',
+		region: 'Moneghetti',
+		city: 'Moneghetti',
+	},
+	{
+		country_short: 'MD',
+		region: 'Donduseni',
+		city: 'Donduseni',
+	},
+	{
+		country_short: 'LB',
+		region: 'Baalbek-Hermel',
+		city: 'Baalbek',
+	},
+	{
+		country_short: 'SI',
+		region: 'Nazarje',
+		city: 'Brdo',
+	},
+	{
+		country_short: 'SI',
+		region: 'Bloke',
+		city: 'Sveta Trojica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Komenda',
+		city: 'Moste',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ig',
+		city: 'Ig',
+	},
+	{
+		country_short: 'SI',
+		region: 'Radece',
+		city: 'Radece',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ravne na Koroskem',
+		city: 'Kotlje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Miren-Kostanjevica',
+		city: 'Miren',
+	},
+	{
+		country_short: 'SI',
+		region: 'Log-Dragomer',
+		city: 'Dragomer',
+	},
+	{
+		country_short: 'SI',
+		region: 'Dravograd',
+		city: 'Dravograd',
+	},
+	{
+		country_short: 'SI',
+		region: 'Zetale',
+		city: 'Cermozise',
+	},
+	{
+		country_short: 'KG',
+		region: 'Batken',
+		city: 'Batken',
+	},
+	{
+		country_short: 'LI',
+		region: 'Planken',
+		city: 'Planken',
+	},
+	{
+		country_short: 'LV',
+		region: 'Augsdaugavas novads',
+		city: 'Ilukste',
+	},
+	{
+		country_short: 'SI',
+		region: 'Salovci',
+		city: 'Lucova',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Goycay',
+		city: 'Geoktschai',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Goygol',
+		city: 'Goygol',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Beylaqan',
+		city: 'Orconikidze',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Ucar',
+		city: 'Ujar',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Sabirabad',
+		city: 'Sabirabad',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Barda',
+		city: 'Barda',
+	},
+	{
+		country_short: 'SM',
+		region: 'Chiesanuova',
+		city: 'Chiesanuova',
+	},
+	{
+		country_short: 'SI',
+		region: 'Zavrc',
+		city: 'Turski Vrh',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Zaqatala',
+		city: 'Zaqatala',
+	},
+	{
+		country_short: 'MK',
+		region: 'Sopiste',
+		city: 'Sopishte',
+	},
+	{
+		country_short: 'SI',
+		region: 'Vitanje',
+		city: 'Rakovec',
+	},
+	{
+		country_short: 'YT',
+		region: 'Pamandzi',
+		city: 'Pamandzi',
+	},
+	{
+		country_short: 'YT',
+		region: 'Bandrele',
+		city: 'Bandrele',
+	},
+	{
+		country_short: 'YT',
+		region: 'Sada',
+		city: 'Sada',
+	},
+	{
+		country_short: 'YT',
+		region: 'Kani-Keli',
+		city: 'Kani Keli',
+	},
+	{
+		country_short: 'YT',
+		region: 'Ouangani',
+		city: 'Ouangani',
+	},
+	{
+		country_short: 'YT',
+		region: 'Bandraboua',
+		city: 'Bandraboua',
+	},
+	{
+		country_short: 'SI',
+		region: 'Zuzemberk',
+		city: 'Zuzemberk',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ankaran',
+		city: 'Ankaran',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kostel',
+		city: 'Planina',
+	},
+	{
+		country_short: 'MT',
+		region: 'Sannat',
+		city: 'Sannat',
+	},
+	{
+		country_short: 'JO',
+		region: 'At Tafilah',
+		city: 'Busayra',
+	},
+	{
+		country_short: 'SI',
+		region: 'Ruse',
+		city: 'Ruse',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Fuzuli',
+		city: 'Horadiz',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Samux',
+		city: 'Qarayeri',
+	},
+	{
+		country_short: 'YE',
+		region: 'Al Mahrah',
+		city: 'Sayhut',
+	},
+	{
+		country_short: 'TM',
+		region: 'Mary',
+		city: 'Mary',
+	},
+	{
+		country_short: 'CR',
+		region: 'Puntarenas',
+		city: 'Ciudad Cortes',
+	},
+	{
+		country_short: 'SI',
+		region: 'Turnisce',
+		city: 'Turnisce',
+	},
+	{
+		country_short: 'SI',
+		region: 'Loski Potok',
+		city: 'Srednja Vas-Loski Potok',
+	},
+	{
+		country_short: 'TM',
+		region: 'Lebap',
+		city: 'Turkmenabat',
+	},
+	{
+		country_short: 'TM',
+		region: 'Dasoguz',
+		city: 'Koeneuergench',
+	},
+	{
+		country_short: 'MK',
+		region: 'Demir Kapija',
+		city: 'Demir Kapija',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sodrazica',
+		city: 'Sodrazica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sveti Jurij ob Scavnici',
+		city: 'Videm',
+	},
+	{
+		country_short: 'MK',
+		region: 'Demir Hisar',
+		city: 'Sopotnica',
+	},
+	{
+		country_short: 'LK',
+		region: 'North Central Province',
+		city: 'Anuradhapura',
+	},
+	{
+		country_short: 'GU',
+		region: 'Yigo',
+		city: 'Yigo Village',
+	},
+	{
+		country_short: 'GU',
+		region: 'Sinajana',
+		city: 'Sinajana Village',
+	},
+	{
+		country_short: 'GU',
+		region: 'Santa Rita',
+		city: 'Santa Rita Village',
+	},
+	{
+		country_short: 'GU',
+		region: 'Agana Heights',
+		city: 'Agana Heights Municipality',
+	},
+	{
+		country_short: 'GU',
+		region: 'Agat',
+		city: 'Agat Village',
+	},
+	{
+		country_short: 'KE',
+		region: 'Vihiga',
+		city: 'Luanda',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kalungu',
+		city: 'Bukulula',
+	},
+	{
+		country_short: 'MW',
+		region: 'Dedza',
+		city: 'Dedza',
+	},
+	{
+		country_short: 'MW',
+		region: 'Neno',
+		city: 'Neno',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kyegegwa',
+		city: 'Kyegegwa',
+	},
+	{
+		country_short: 'UG',
+		region: 'Nwoya',
+		city: 'Kacabu',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kaliro',
+		city: 'Kaliro',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kiryandongo',
+		city: 'Kiryandongo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kaberamaido',
+		city: 'Kaberamaido',
+	},
+	{
+		country_short: 'UG',
+		region: 'Rakai',
+		city: 'Rakai',
+	},
+	{
+		country_short: 'UG',
+		region: 'Bugiri',
+		city: 'Bugiri',
+	},
+	{
+		country_short: 'UG',
+		region: 'Nakaseke',
+		city: 'Nakaseke',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kasese',
+		city: 'Kilembe',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kayunga',
+		city: 'Kayunga',
+	},
+	{
+		country_short: 'UG',
+		region: 'Buhweju',
+		city: 'Rugongo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Mbale',
+		city: 'Mbale',
+	},
+	{
+		country_short: 'UG',
+		region: 'Mityana',
+		city: 'Mityana',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kalangala',
+		city: 'Kalangala',
+	},
+	{
+		country_short: 'UG',
+		region: 'Bududa',
+		city: 'Bududa',
+	},
+	{
+		country_short: 'UG',
+		region: 'Yumbe',
+		city: 'Yumbe',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kween',
+		city: 'Binyin',
+	},
+	{
+		country_short: 'UG',
+		region: 'Sheema',
+		city: 'Kibingo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kamuli',
+		city: 'Kamuli',
+	},
+	{
+		country_short: 'UG',
+		region: 'Manafwa',
+		city: 'Manafwa',
+	},
+	{
+		country_short: 'UG',
+		region: 'Buikwe',
+		city: 'Njeru',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kiboga',
+		city: 'Kiboga',
+	},
+	{
+		country_short: 'UG',
+		region: 'Soroti',
+		city: 'Soroti',
+	},
+	{
+		country_short: 'UG',
+		region: 'Mpigi',
+		city: 'Mpigi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Gomba',
+		city: 'Kanoni',
+	},
+	{
+		country_short: 'UG',
+		region: 'Isingiro',
+		city: 'Isingiro',
+	},
+	{
+		country_short: 'UG',
+		region: 'Napak',
+		city: 'Napak',
+	},
+	{
+		country_short: 'UG',
+		region: 'Abim',
+		city: 'Abim',
+	},
+	{
+		country_short: 'UG',
+		region: 'Bushenyi',
+		city: 'Bushenyi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Bukedea',
+		city: 'Bukedea',
+	},
+	{
+		country_short: 'UG',
+		region: 'Ntungamo',
+		city: 'Ntungamo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Masindi',
+		city: 'Masindi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Mayuge',
+		city: 'Mayuge',
+	},
+	{
+		country_short: 'UG',
+		region: 'Moroto',
+		city: 'Moroto',
+	},
+	{
+		country_short: 'UG',
+		region: 'Lyantonde',
+		city: 'Lyantonde',
+	},
+	{
+		country_short: 'UG',
+		region: 'Bulambuli',
+		city: 'Bulambuli',
+	},
+	{
+		country_short: 'UG',
+		region: 'Sironko',
+		city: 'Sironko',
+	},
+	{
+		country_short: 'UG',
+		region: 'Lira',
+		city: 'Lira',
+	},
+	{
+		country_short: 'UG',
+		region: 'Apac',
+		city: 'Apac',
+	},
+	{
+		country_short: 'UG',
+		region: 'Luwero',
+		city: 'Wobulenzi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Amolatar',
+		city: 'Amolatar',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kamwenge',
+		city: 'Kamwenge',
+	},
+	{
+		country_short: 'UG',
+		region: 'Lwengo',
+		city: 'Lwengo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kisoro',
+		city: 'Kisoro',
+	},
+	{
+		country_short: 'UG',
+		region: 'Tororo',
+		city: 'Tororo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Luuka',
+		city: 'Luuka Town',
+	},
+	{
+		country_short: 'UG',
+		region: 'Sembabule',
+		city: 'Sembabule',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kapchorwa',
+		city: 'Kapchorwa',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kole',
+		city: 'Kole',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kyankwanzi',
+		city: 'Kyankwanzi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Alebtong',
+		city: 'Alebtong',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kibuku',
+		city: 'Kibuku',
+	},
+	{
+		country_short: 'UG',
+		region: 'Katakwi',
+		city: 'Katakwi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kaabong',
+		city: 'Kaabong',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kibaale',
+		city: 'Kagadi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Adjumani',
+		city: 'Adjumani',
+	},
+	{
+		country_short: 'UG',
+		region: 'Ntoroko',
+		city: 'Ntoroko',
+	},
+	{
+		country_short: 'UG',
+		region: 'Rubirizi',
+		city: 'Rubirizi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Agago',
+		city: 'Pader Palwo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Nebbi',
+		city: 'Nebbi',
+	},
+	{
+		country_short: 'SD',
+		region: 'White Nile',
+		city: 'Kosti',
+	},
+	{
+		country_short: 'SD',
+		region: 'Central Darfur',
+		city: 'Zalingei',
+	},
+	{
+		country_short: 'SO',
+		region: 'Mudug',
+		city: 'Gaalkacyo',
+	},
+	{
+		country_short: 'BI',
+		region: 'Bururi',
+		city: 'Bururi',
+	},
+	{
+		country_short: 'SL',
+		region: 'Northern',
+		city: 'Makeni',
+	},
+	{
+		country_short: 'GQ',
+		region: 'Kie-Ntem',
+		city: 'Ncue',
+	},
+	{
+		country_short: 'GH',
+		region: 'Volta',
+		city: 'Hohoe',
+	},
+	{
+		country_short: 'GN',
+		region: 'Kouroussa',
+		city: 'Kouroussa',
+	},
+	{
+		country_short: 'GN',
+		region: 'Dinguiraye',
+		city: 'Dinguiraye',
+	},
+	{
+		country_short: 'BF',
+		region: 'Oubritenga',
+		city: 'Ziniare',
+	},
+	{
+		country_short: 'BF',
+		region: 'Zoundweogo',
+		city: 'Manga',
+	},
+	{
+		country_short: 'BF',
+		region: 'Oudalan',
+		city: 'Gorom-Gorom',
+	},
+	{
+		country_short: 'BF',
+		region: 'Passore',
+		city: 'Yako',
+	},
+	{
+		country_short: 'BF',
+		region: 'Comoe',
+		city: 'Banfora',
+	},
+	{
+		country_short: 'BF',
+		region: 'Kouritenga',
+		city: 'Koupela',
+	},
+	{
+		country_short: 'BF',
+		region: 'Leraba',
+		city: 'Sindou',
+	},
+	{
+		country_short: 'BF',
+		region: 'Nahouri',
+		city: 'Po',
+	},
+	{
+		country_short: 'BF',
+		region: 'Seno',
+		city: 'Dori',
+	},
+	{
+		country_short: 'BF',
+		region: 'Bazega',
+		city: 'Kombissiri',
+	},
+	{
+		country_short: 'BF',
+		region: 'Kossi',
+		city: 'Nouna',
+	},
+	{
+		country_short: 'BF',
+		region: 'Namentenga',
+		city: 'Boulsa',
+	},
+	{
+		country_short: 'BF',
+		region: 'Sissili',
+		city: 'Leo',
+	},
+	{
+		country_short: 'BF',
+		region: 'Gourma',
+		city: "Fada N'Gourma",
+	},
+	{
+		country_short: 'BF',
+		region: 'Ganzourgou',
+		city: 'Zorgho',
+	},
+	{
+		country_short: 'BF',
+		region: 'Ziro',
+		city: 'Sapouy',
+	},
+	{
+		country_short: 'BF',
+		region: 'Loroum',
+		city: 'Titao',
+	},
+	{
+		country_short: 'BF',
+		region: 'Kourweogo',
+		city: 'Bousse',
+	},
+	{
+		country_short: 'BF',
+		region: 'Sanguie',
+		city: 'Reo',
+	},
+	{
+		country_short: 'BF',
+		region: 'Kompienga',
+		city: 'Pama',
+	},
+	{
+		country_short: 'BF',
+		region: 'Sourou',
+		city: 'Tougan',
+	},
+	{
+		country_short: 'BF',
+		region: 'Gnagna',
+		city: 'Bogande',
+	},
+	{
+		country_short: 'BF',
+		region: 'Soum',
+		city: 'Djibo',
+	},
+	{
+		country_short: 'BF',
+		region: 'Zondoma',
+		city: 'Gourcy',
+	},
+	{
+		country_short: 'SO',
+		region: 'Jubbada Hoose',
+		city: 'Kismayo',
+	},
+	{
+		country_short: 'SO',
+		region: 'Sool',
+		city: 'Laascaanood',
+	},
+	{
+		country_short: 'TD',
+		region: 'Bahr el Ghazal',
+		city: 'Salal',
+	},
+	{
+		country_short: 'SL',
+		region: 'Southern',
+		city: 'Mogbwemo',
+	},
+	{
+		country_short: 'SL',
+		region: 'North Western',
+		city: 'Port Loko',
+	},
+	{
+		country_short: 'CD',
+		region: 'Kongo Central',
+		city: 'Tshela',
+	},
+	{
+		country_short: 'LA',
+		region: 'Louangphabang',
+		city: 'Luang Prabang',
+	},
+	{
+		country_short: 'KH',
+		region: 'Kampong Spueu',
+		city: 'Kampong Speu',
+	},
+	{
+		country_short: 'PG',
+		region: 'Eastern Highlands',
+		city: 'Goroka',
+	},
+	{
+		country_short: 'PG',
+		region: 'Morobe',
+		city: 'Lae',
+	},
+	{
+		country_short: 'PG',
+		region: 'Western',
+		city: 'Tabubil',
+	},
+	{
+		country_short: 'TL',
+		region: 'Ainaro',
+		city: 'Xanana Gusm',
+	},
+	{
+		country_short: 'BT',
+		region: 'Tsirang',
+		city: 'Tsirang',
+	},
+	{
+		country_short: 'BT',
+		region: 'Punakha',
+		city: 'Punakha',
+	},
+	{
+		country_short: 'BT',
+		region: 'Wangdue Phodrang',
+		city: 'Lung Chen',
+	},
+	{
+		country_short: 'BT',
+		region: 'Samtse',
+		city: 'Samtse',
+	},
+	{
+		country_short: 'BT',
+		region: 'Paro',
+		city: 'Paro',
+	},
+	{
+		country_short: 'AF',
+		region: 'Ghazni',
+		city: 'Ghazni',
+	},
+	{
+		country_short: 'NR',
+		region: 'Anetan',
+		city: 'Ronave',
+	},
+	{
+		country_short: 'MV',
+		region: 'South Huvadhu Atoll',
+		city: 'Thinadhoo',
+	},
+	{
+		country_short: 'KI',
+		region: 'Line Islands',
+		city: 'Tabwakea Village',
+	},
+	{
+		country_short: 'MN',
+		region: 'Dornod',
+		city: 'Choibalsan',
+	},
+	{
+		country_short: 'MV',
+		region: 'North Thiladhunmathi',
+		city: 'Dhidhdhoo',
+	},
+	{
+		country_short: 'AS',
+		region: 'Western District',
+		city: 'Tafuna',
+	},
+	{
+		country_short: 'PG',
+		region: 'East Sepik',
+		city: 'Wewak',
+	},
+	{
+		country_short: 'BT',
+		region: 'Trashigang',
+		city: 'Kanglung',
+	},
+	{
+		country_short: 'MN',
+		region: 'Tov',
+		city: 'Orgil',
+	},
+	{
+		country_short: 'WS',
+		region: "Fa'asaleleaga",
+		city: 'Vaimauga',
+	},
+	{
+		country_short: 'AQ',
+		region: 'Antarctica',
+		city: 'McMurdo Station',
+	},
+	{
+		country_short: 'PG',
+		region: 'Madang',
+		city: 'Bank',
+	},
+	{
+		country_short: 'MM',
+		region: 'Rakhine',
+		city: 'Sittwe',
+	},
+	{
+		country_short: 'BT',
+		region: 'Chhukha',
+		city: 'Phuntsholing',
+	},
+	{
+		country_short: 'FM',
+		region: 'Yap',
+		city: 'Colonia',
+	},
+	{
+		country_short: 'BT',
+		region: 'Samdrup Jongkhar',
+		city: 'Samdrup Jongkhar',
+	},
+	{
+		country_short: 'GU',
+		region: 'Mongmong-Toto-Maite',
+		city: 'Mongmong-Toto-Maite Village',
+	},
+	{
+		country_short: 'LK',
+		region: 'Eastern Province',
+		city: 'Trincomalee',
+	},
+	{
+		country_short: 'WF',
+		region: 'Sigave',
+		city: 'Alo',
+	},
+	{
+		country_short: 'TL',
+		region: 'Liquica',
+		city: 'Vatunau',
+	},
+	{
+		country_short: 'TL',
+		region: 'Cova Lima',
+		city: 'Orun',
+	},
+	{
+		country_short: 'LA',
+		region: 'Phongsali',
+		city: 'Phongsali',
+	},
+	{
+		country_short: 'PG',
+		region: 'Western Highlands',
+		city: 'Mount Hagen',
+	},
+	{
+		country_short: 'PF',
+		region: 'Iles Sous-le-Vent',
+		city: 'Vaitape',
+	},
+	{
+		country_short: 'NZ',
+		region: 'Chatham Islands Territory',
+		city: 'Waitangi',
+	},
+	{
+		country_short: 'BQ',
+		region: ' Sint Eustatius and Saba"',
+		city: 'Bonaire',
+	},
+	{
+		country_short: 'CU',
+		region: 'Santiago de Cuba',
+		city: 'Santiago de Cuba',
+	},
+	{
+		country_short: 'CU',
+		region: 'Holguin',
+		city: 'Holguin',
+	},
+	{
+		country_short: 'VE',
+		region: 'Sucre',
+		city: 'Cumana',
+	},
+	{
+		country_short: 'VE',
+		region: 'Barinas',
+		city: 'Barinitas',
+	},
+	{
+		country_short: 'EC',
+		region: 'Galapagos',
+		city: 'Puerto Ayora',
+	},
+	{
+		country_short: 'PE',
+		region: 'Cusco',
+		city: 'Cusco',
+	},
+	{
+		country_short: 'TT',
+		region: 'Chaguanas',
+		city: 'Chaguanas',
+	},
+	{
+		country_short: 'BO',
+		region: 'Cochabamba',
+		city: 'Cochabamba',
+	},
+	{
+		country_short: 'PY',
+		region: 'Central',
+		city: 'San Lorenzo',
+	},
+	{
+		country_short: 'PF',
+		region: 'Iles Tuamotu-Gambier',
+		city: 'Rikitea',
+	},
+	{
+		country_short: 'FM',
+		region: 'Chuuk',
+		city: 'Weno',
+	},
+	{
+		country_short: 'MN',
+		region: 'Hovd',
+		city: 'Khovd',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint James Windward',
+		city: 'Mount Lily',
+	},
+	{
+		country_short: 'LC',
+		region: 'Dennery',
+		city: 'Dennery',
+	},
+	{
+		country_short: 'KE',
+		region: 'Tana River',
+		city: 'Hola',
+	},
+	{
+		country_short: 'DZ',
+		region: "M'sila",
+		city: "'Ain el Melh",
+	},
+	{
+		country_short: 'NG',
+		region: 'Taraba',
+		city: 'Beli',
+	},
+	{
+		country_short: 'MW',
+		region: 'Mchinji',
+		city: 'Mchinji',
+	},
+	{
+		country_short: 'BF',
+		region: 'Ioba',
+		city: 'Dano',
+	},
+	{
+		country_short: 'BS',
+		region: 'San Salvador',
+		city: 'Cockburn Town',
+	},
+	{
+		country_short: 'ME',
+		region: 'Tuzi',
+		city: 'Tuzi',
+	},
+	{
+		country_short: 'MK',
+		region: 'Vasilevo',
+		city: 'Vasilevo',
+	},
+	{
+		country_short: 'SI',
+		region: 'Cankova',
+		city: 'Cankova',
+	},
+	{
+		country_short: 'SI',
+		region: 'Vuzenica',
+		city: 'Vuzenica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kuzma',
+		city: 'Kuzma',
+	},
+	{
+		country_short: 'SI',
+		region: 'Horjul',
+		city: 'Horjul',
+	},
+	{
+		country_short: 'SM',
+		region: 'Serravalle',
+		city: 'Serravalle',
+	},
+	{
+		country_short: 'RS',
+		region: 'Pecki okrug',
+		city: 'Klina',
+	},
+	{
+		country_short: 'PH',
+		region: 'Basilan',
+		city: 'City of Isabela',
+	},
+	{
+		country_short: 'AF',
+		region: 'Sar-e Pul',
+		city: 'Sar-e Pul',
+	},
+	{
+		country_short: 'MN',
+		region: 'Selenge',
+		city: 'Delgerhaan',
+	},
+	{
+		country_short: 'PH',
+		region: 'Biliran',
+		city: 'Talostosan',
+	},
+	{
+		country_short: 'LA',
+		region: 'Xiangkhouang',
+		city: 'Muang Phonsavan',
+	},
+	{
+		country_short: 'LA',
+		region: 'Bokeo',
+		city: 'Ban Houayxay',
+	},
+	{
+		country_short: 'LA',
+		region: 'Bolikhamxai',
+		city: 'Paksan',
+	},
+	{
+		country_short: 'LA',
+		region: 'Xekong',
+		city: 'Dak Cheung',
+	},
+	{
+		country_short: 'LA',
+		region: 'Oudomxai',
+		city: 'Muang Xai',
+	},
+	{
+		country_short: 'PH',
+		region: 'Tawi-Tawi',
+		city: 'Bongao',
+	},
+	{
+		country_short: 'PH',
+		region: 'Lanao del Sur',
+		city: 'Uyaan',
+	},
+	{
+		country_short: 'GU',
+		region: 'Chalan Pago-Ordot',
+		city: 'Chalan Pago-Ordot Municipality',
+	},
+	{
+		country_short: 'AF',
+		region: 'Ghor',
+		city: 'Shahrak',
+	},
+	{
+		country_short: 'MH',
+		region: 'Kwajalein',
+		city: 'Ebaye',
+	},
+	{
+		country_short: 'IN',
+		region: 'Lakshadweep',
+		city: 'Kavaratti',
+	},
+	{
+		country_short: 'BT',
+		region: 'Sarpang',
+		city: 'Sarpang',
+	},
+	{
+		country_short: 'PK',
+		region: 'Gilgit-Baltistan',
+		city: 'Barishal',
+	},
+	{
+		country_short: 'BT',
+		region: 'Dagana',
+		city: 'Daga',
+	},
+	{
+		country_short: 'BT',
+		region: 'Bumthang',
+		city: 'Jakar',
+	},
+	{
+		country_short: 'BT',
+		region: 'Monggar',
+		city: 'Mongar',
+	},
+	{
+		country_short: 'BT',
+		region: 'Lhuentse',
+		city: 'Lhuentse',
+	},
+	{
+		country_short: 'GU',
+		region: 'Yona',
+		city: 'Yona Municipality',
+	},
+	{
+		country_short: 'PF',
+		region: 'Iles Australes',
+		city: 'Moerai',
+	},
+	{
+		country_short: 'MV',
+		region: 'North Ari Atoll',
+		city: 'Rasdhoo',
+	},
+	{
+		country_short: 'AF',
+		region: 'Logar',
+		city: 'Baraki Barak',
+	},
+	{
+		country_short: 'LS',
+		region: 'Leribe',
+		city: 'Leribe',
+	},
+	{
+		country_short: 'LS',
+		region: 'Botha-Bothe',
+		city: 'Butha-Buthe',
+	},
+	{
+		country_short: 'LS',
+		region: 'Mokhotlong',
+		city: 'Mokhotlong',
+	},
+	{
+		country_short: 'LS',
+		region: "Qacha's Nek",
+		city: "Qacha's Nek",
+	},
+	{
+		country_short: 'CL',
+		region: 'Los Rios',
+		city: 'Valdivia',
+	},
+	{
+		country_short: 'PA',
+		region: 'Bocas del Toro',
+		city: 'Bocas del Toro',
+	},
+	{
+		country_short: 'TT',
+		region: 'San Juan-Laventille',
+		city: 'San Juan',
+	},
+	{
+		country_short: 'TT',
+		region: 'Tobago',
+		city: 'Roxborough',
+	},
+	{
+		country_short: 'TT',
+		region: 'San Fernando',
+		city: 'Mon Repos',
+	},
+	{
+		country_short: 'HN',
+		region: 'Yoro',
+		city: 'El Progreso',
+	},
+	{
+		country_short: 'BZ',
+		region: 'Stann Creek',
+		city: 'Dangriga',
+	},
+	{
+		country_short: 'DO',
+		region: 'Santiago Rodriguez',
+		city: 'Sabaneta',
+	},
+	{
+		country_short: 'PE',
+		region: 'San Martin',
+		city: 'Moyobamba',
+	},
+	{
+		country_short: 'PE',
+		region: 'Huanuco',
+		city: 'Tingo Maria',
+	},
+	{
+		country_short: 'PY',
+		region: 'Caazapa',
+		city: 'General Higinio Morinigo',
+	},
+	{
+		country_short: 'YE',
+		region: 'Al Mahwit',
+		city: 'Shibam',
+	},
+	{
+		country_short: 'EH',
+		region: 'Western Sahara',
+		city: 'Laayoune / El Aaiun',
+	},
+	{
+		country_short: 'HM',
+		region: 'Heard Island and McDonald Islands',
+		city: 'Heard Island and McDonald Islands',
+	},
+	{
+		country_short: 'HN',
+		region: 'Copan',
+		city: 'Copan',
+	},
+	{
+		country_short: 'TT',
+		region: 'Arima',
+		city: 'Arima',
+	},
+	{
+		country_short: 'PY',
+		region: 'Misiones',
+		city: 'Ayolas',
+	},
+	{
+		country_short: 'HN',
+		region: 'Valle',
+		city: 'Nacaome',
+	},
+	{
+		country_short: 'TT',
+		region: 'Couva-Tabaquite-Talparo',
+		city: 'Tabaquite',
+	},
+	{
+		country_short: 'NI',
+		region: 'Masaya',
+		city: 'Masaya',
+	},
+	{
+		country_short: 'CO',
+		region: 'Choco',
+		city: 'Quibdo',
+	},
+	{
+		country_short: 'GT',
+		region: 'Huehuetenango',
+		city: 'Huehuetenango',
+	},
+	{
+		country_short: 'MT',
+		region: 'Balzan',
+		city: 'Balzan',
+	},
+	{
+		country_short: 'TT',
+		region: 'Sangre Grande',
+		city: 'Sangre Grande',
+	},
+	{
+		country_short: 'DO',
+		region: 'Hermanas Mirabal',
+		city: 'Tenares',
+	},
+	{
+		country_short: 'NI',
+		region: 'Esteli',
+		city: 'La Trinidad',
+	},
+	{
+		country_short: 'GT',
+		region: 'Chimaltenango',
+		city: 'Tecpan Guatemala',
+	},
+	{
+		country_short: 'CO',
+		region: 'Guainia',
+		city: 'Inirida',
+	},
+	{
+		country_short: 'VE',
+		region: 'Trujillo',
+		city: 'Betijoque',
+	},
+	{
+		country_short: 'PY',
+		region: 'Cordillera',
+		city: 'Caacupe',
+	},
+	{
+		country_short: 'SI',
+		region: 'Radlje ob Dravi',
+		city: 'Radlje ob Dravi',
+	},
+	{
+		country_short: 'SI',
+		region: 'Cerkno',
+		city: 'Cerkno',
+	},
+	{
+		country_short: 'DO',
+		region: 'Elias Pina',
+		city: 'Comendador',
+	},
+	{
+		country_short: 'HT',
+		region: 'Sud',
+		city: 'Les Cayes',
+	},
+	{
+		country_short: 'HT',
+		region: 'Centre',
+		city: 'Hinche',
+	},
+	{
+		country_short: 'MX',
+		region: 'Baja California Sur',
+		city: 'La Paz',
+	},
+	{
+		country_short: 'AF',
+		region: 'Paktika',
+		city: 'Zarah Sharan',
+	},
+	{
+		country_short: 'SI',
+		region: 'Mokronog-Trebelno',
+		city: 'Mokronog',
+	},
+	{
+		country_short: 'UY',
+		region: 'Lavalleja',
+		city: 'Solis de Mataojo',
+	},
+	{
+		country_short: 'UY',
+		region: 'Maldonado',
+		city: 'Pan de Azucar',
+	},
+	{
+		country_short: 'UY',
+		region: 'Colonia',
+		city: 'Colonia del Sacramento',
+	},
+	{
+		country_short: 'UY',
+		region: 'Canelones',
+		city: 'Las Piedras',
+	},
+	{
+		country_short: 'UY',
+		region: 'Rocha',
+		city: 'Lascano',
+	},
+	{
+		country_short: 'UY',
+		region: 'Cerro Largo',
+		city: 'Acegua',
+	},
+	{
+		country_short: 'UY',
+		region: 'Tacuarembo',
+		city: 'Tacuarembo',
+	},
+	{
+		country_short: 'CU',
+		region: 'Matanzas',
+		city: 'Matanzas',
+	},
+	{
+		country_short: 'CU',
+		region: 'Ciego de Avila',
+		city: 'Villa',
+	},
+	{
+		country_short: 'CU',
+		region: 'Cienfuegos',
+		city: 'Cienfuegos',
+	},
+	{
+		country_short: 'CU',
+		region: 'Sancti Spiritus',
+		city: 'Sancti Spiritus',
+	},
+	{
+		country_short: 'CU',
+		region: 'Mayabeque',
+		city: 'Jamaica',
+	},
+	{
+		country_short: 'CU',
+		region: 'Artemisa',
+		city: 'Bauta',
+	},
+	{
+		country_short: 'CU',
+		region: 'Guantanamo',
+		city: 'Guantanamo',
+	},
+	{
+		country_short: 'CU',
+		region: 'Camaguey',
+		city: 'Camaguey',
+	},
+	{
+		country_short: 'CU',
+		region: 'Las Tunas',
+		city: 'Las Tunas',
+	},
+	{
+		country_short: 'CU',
+		region: 'Granma',
+		city: 'Bayamo',
+	},
+	{
+		country_short: 'CU',
+		region: 'Pinar del Rio',
+		city: 'Pinar del Rio',
+	},
+	{
+		country_short: 'CU',
+		region: 'Villa Clara',
+		city: 'Santa Clara',
+	},
+	{
+		country_short: 'NI',
+		region: 'Costa Caribe Norte',
+		city: 'Alo',
+	},
+	{
+		country_short: 'NI',
+		region: 'Nueva Segovia',
+		city: 'Quilali',
+	},
+	{
+		country_short: 'SI',
+		region: 'Solcava',
+		city: 'Solcava',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kobarid',
+		city: 'Kobarid',
+	},
+	{
+		country_short: 'SI',
+		region: 'Tisina',
+		city: 'Gederovci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Rence-Vogrsko',
+		city: 'Bukovica',
+	},
+	{
+		country_short: 'SI',
+		region: 'Hodos',
+		city: 'Hodos',
+	},
+	{
+		country_short: 'SI',
+		region: 'Podlehnik',
+		city: 'Podlehnik',
+	},
+	{
+		country_short: 'SI',
+		region: 'Sveti Andraz v Slovenskih Goricah',
+		city: 'Vitomarci',
+	},
+	{
+		country_short: 'SI',
+		region: 'Cirkulane',
+		city: 'Pohorje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Muta',
+		city: 'Muta',
+	},
+	{
+		country_short: 'SI',
+		region: 'Grad',
+		city: 'Grad',
+	},
+	{
+		country_short: 'SI',
+		region: 'Trnovska Vas',
+		city: 'Trnovska Vas',
+	},
+	{
+		country_short: 'MW',
+		region: 'Chikwawa',
+		city: 'Chikwawa',
+	},
+	{
+		country_short: 'SC',
+		region: 'Grand Anse Praslin',
+		city: 'Anse Kerlan',
+	},
+	{
+		country_short: 'UG',
+		region: 'Moyo',
+		city: 'Moyo',
+	},
+	{
+		country_short: 'BI',
+		region: 'Ngozi',
+		city: 'Ngozi',
+	},
+	{
+		country_short: 'TD',
+		region: 'Chari-Baguirmi',
+		city: 'Bousso',
+	},
+	{
+		country_short: 'TD',
+		region: 'Lac',
+		city: 'Bol',
+	},
+	{
+		country_short: 'TD',
+		region: 'Sila',
+		city: 'Goz Beida',
+	},
+	{
+		country_short: 'GA',
+		region: 'Moyen-Ogooue',
+		city: 'Lambarene',
+	},
+	{
+		country_short: 'ML',
+		region: 'Kayes',
+		city: 'Kayes Ndi',
+	},
+	{
+		country_short: 'BI',
+		region: 'Mwaro',
+		city: 'Mwaro',
+	},
+	{
+		country_short: 'LY',
+		region: 'Nalut',
+		city: 'Nalut',
+	},
+	{
+		country_short: 'LA',
+		region: 'Salavan',
+		city: 'Salavan',
+	},
+	{
+		country_short: 'UG',
+		region: 'Ibanda',
+		city: 'Bisheshe',
+	},
+	{
+		country_short: 'UG',
+		region: 'Rukungiri',
+		city: 'Rukungiri',
+	},
+	{
+		country_short: 'UG',
+		region: 'Buvuma',
+		city: 'Kitamilo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kitgum',
+		city: 'Kitgum',
+	},
+	{
+		country_short: 'UG',
+		region: 'Koboko',
+		city: 'Koboko',
+	},
+	{
+		country_short: 'UG',
+		region: 'Nakapiripirit',
+		city: 'Nakapiripirit',
+	},
+	{
+		country_short: 'UG',
+		region: 'Pallisa',
+		city: 'Pallisa',
+	},
+	{
+		country_short: 'UG',
+		region: 'Bundibugyo',
+		city: 'Bundibugyo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Kumi',
+		city: 'Kumi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Pader',
+		city: 'Pader',
+	},
+	{
+		country_short: 'UG',
+		region: 'Buyende',
+		city: 'Buyende',
+	},
+	{
+		country_short: 'UG',
+		region: 'Bukomansibi',
+		city: 'Bukomansimbi',
+	},
+	{
+		country_short: 'UG',
+		region: 'Namayingo',
+		city: 'Namayingo',
+	},
+	{
+		country_short: 'UG',
+		region: 'Budaka',
+		city: 'Budaka',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Agsu',
+		city: 'Aghsu',
+	},
+	{
+		country_short: 'CG',
+		region: 'Sangha',
+		city: 'Ouesso',
+	},
+	{
+		country_short: 'NI',
+		region: 'Leon',
+		city: 'Leon',
+	},
+	{
+		country_short: 'HT',
+		region: "Grande'Anse",
+		city: 'Baraderes',
+	},
+	{
+		country_short: 'HT',
+		region: 'Nord',
+		city: 'Pignon',
+	},
+	{
+		country_short: 'HT',
+		region: 'Nord-Ouest',
+		city: 'Ti Port-de-Paix',
+	},
+	{
+		country_short: 'TT',
+		region: 'Point Fortin',
+		city: 'Point Fortin',
+	},
+	{
+		country_short: 'TT',
+		region: 'Siparia',
+		city: 'Siparia',
+	},
+	{
+		country_short: 'BO',
+		region: 'Potosi',
+		city: 'Potosi',
+	},
+	{
+		country_short: 'BO',
+		region: 'Tarija',
+		city: 'Tarija',
+	},
+	{
+		country_short: 'UY',
+		region: 'Paysandu',
+		city: 'Paysandu',
+	},
+	{
+		country_short: 'NG',
+		region: 'Kebbi',
+		city: 'Birnin Kebbi',
+	},
+	{
+		country_short: 'NI',
+		region: 'Chinandega',
+		city: 'Chinandega',
+	},
+	{
+		country_short: 'UY',
+		region: 'Artigas',
+		city: 'Artigas',
+	},
+	{
+		country_short: 'UY',
+		region: 'San Jose',
+		city: 'Libertad',
+	},
+	{
+		country_short: 'UY',
+		region: 'Rivera',
+		city: 'Tranqueras',
+	},
+	{
+		country_short: 'UY',
+		region: 'Rio Negro',
+		city: 'Fray Bentos',
+	},
+	{
+		country_short: 'UY',
+		region: 'Flores',
+		city: 'Trinidad',
+	},
+	{
+		country_short: 'UY',
+		region: 'Soriano',
+		city: 'Mercedes',
+	},
+	{
+		country_short: 'UY',
+		region: 'Florida',
+		city: 'Florida',
+	},
+	{
+		country_short: 'UY',
+		region: 'Treinta y Tres',
+		city: 'Treinta y Tres',
+	},
+	{
+		country_short: 'PE',
+		region: 'Huancavelica',
+		city: 'Cieneguilla',
+	},
+	{
+		country_short: 'PE',
+		region: 'Ayacucho',
+		city: 'Ayna',
+	},
+	{
+		country_short: 'PE',
+		region: 'Apurimac',
+		city: 'Andahuaylas',
+	},
+	{
+		country_short: 'BZ',
+		region: 'Orange Walk',
+		city: 'Orange Walk',
+	},
+	{
+		country_short: 'SV',
+		region: 'San Vicente',
+		city: 'San Vicente',
+	},
+	{
+		country_short: 'GY',
+		region: 'East Berbice-Corentyne',
+		city: 'New Amsterdam',
+	},
+	{
+		country_short: 'MW',
+		region: 'Ntchisi',
+		city: 'Ntchisi',
+	},
+	{
+		country_short: 'NG',
+		region: 'Ebonyi',
+		city: 'Effium',
+	},
+	{
+		country_short: 'CF',
+		region: 'Sangha',
+		city: 'Nola',
+	},
+	{
+		country_short: 'BZ',
+		region: 'Toledo',
+		city: 'Punta Gorda',
+	},
+	{
+		country_short: 'AR',
+		region: 'Tierra del Fuego',
+		city: 'Ushuaia',
+	},
+	{
+		country_short: 'HN',
+		region: 'Intibuca',
+		city: 'Yamaranguila',
+	},
+	{
+		country_short: 'PY',
+		region: 'Paraguari',
+		city: 'Paraguari',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Astara',
+		city: 'Astara',
+	},
+	{
+		country_short: 'PF',
+		region: 'Iles Marquises',
+		city: 'Atuona',
+	},
+	{
+		country_short: 'PR',
+		region: 'Culebra',
+		city: 'Culebra',
+	},
+	{
+		country_short: 'PY',
+		region: 'Neembucu',
+		city: 'Pilar',
+	},
+	{
+		country_short: 'PY',
+		region: 'Presidente Hayes',
+		city: 'Villa Hayes',
+	},
+	{
+		country_short: 'SI',
+		region: 'Odranci',
+		city: 'Odranci',
+	},
+	{
+		country_short: 'PE',
+		region: 'Cajamarca',
+		city: 'Jaen',
+	},
+	{
+		country_short: 'PE',
+		region: 'Tumbes',
+		city: 'Tumbes',
+	},
+	{
+		country_short: 'PE',
+		region: 'Amazonas',
+		city: 'Bagua Grande',
+	},
+	{
+		country_short: 'HN',
+		region: 'Choluteca',
+		city: 'Ciudad Choluteca',
+	},
+	{
+		country_short: 'HT',
+		region: 'Artibonite',
+		city: 'Desarmes',
+	},
+	{
+		country_short: 'AF',
+		region: 'Parwan',
+		city: 'Jabal os Saraj',
+	},
+	{
+		country_short: 'VE',
+		region: 'Guarico',
+		city: 'Torrealba',
+	},
+	{
+		country_short: 'VE',
+		region: 'Apure',
+		city: 'San Fernando de Apure',
+	},
+	{
+		country_short: 'DO',
+		region: 'Pedernales',
+		city: 'Pedernales',
+	},
+	{
+		country_short: 'GY',
+		region: 'Mahaica-Berbice',
+		city: 'Mahaicony Village',
+	},
+	{
+		country_short: 'GY',
+		region: 'Essequibo Islands-West Demerara',
+		city: 'Parika',
+	},
+	{
+		country_short: 'GY',
+		region: 'Upper Demerara-Berbice',
+		city: 'Linden',
+	},
+	{
+		country_short: 'GY',
+		region: 'Barima-Waini',
+		city: 'Mabaruma',
+	},
+	{
+		country_short: 'CO',
+		region: 'Vichada',
+		city: 'Puerto Carreno',
+	},
+	{
+		country_short: 'GT',
+		region: 'San Marcos',
+		city: 'Catarina',
+	},
+	{
+		country_short: 'GT',
+		region: 'Peten',
+		city: 'Poptun',
+	},
+	{
+		country_short: 'TT',
+		region: 'Diego Martin',
+		city: 'Petit Valley',
+	},
+	{
+		country_short: 'GT',
+		region: 'Zacapa',
+		city: 'Zacapa',
+	},
+	{
+		country_short: 'GT',
+		region: 'Santa Rosa',
+		city: 'Taxisco',
+	},
+	{
+		country_short: 'GT',
+		region: 'Baja Verapaz',
+		city: 'El Chol',
+	},
+	{
+		country_short: 'GY',
+		region: 'Potaro-Siparuni',
+		city: "Saint Mary's",
+	},
+	{
+		country_short: 'GT',
+		region: 'Totonicapan',
+		city: 'Totonicapan',
+	},
+	{
+		country_short: 'HN',
+		region: 'Gracias a Dios',
+		city: 'Puerto Lempira',
+	},
+	{
+		country_short: 'GT',
+		region: 'Retalhuleu',
+		city: 'Santa Cruz Mulua',
+	},
+	{
+		country_short: 'GU',
+		region: 'Talofofo',
+		city: 'Talofofo Municipality',
+	},
+	{
+		country_short: 'GU',
+		region: 'Inarajan',
+		city: 'Inarajan Municipality',
+	},
+	{
+		country_short: 'AF',
+		region: 'Paktiya',
+		city: 'Gardez',
+	},
+	{
+		country_short: 'SM',
+		region: 'Faetano',
+		city: 'Faetano',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Tovuz',
+		city: 'Tovuz',
+	},
+	{
+		country_short: 'MK',
+		region: 'Mogila',
+		city: 'Mogila',
+	},
+	{
+		country_short: 'NI',
+		region: 'Madriz',
+		city: 'Somoto',
+	},
+	{
+		country_short: 'VE',
+		region: 'Cojedes',
+		city: 'San Carlos',
+	},
+	{
+		country_short: 'NI',
+		region: 'Rio San Juan',
+		city: 'San Carlos',
+	},
+	{
+		country_short: 'NI',
+		region: 'Jinotega',
+		city: 'Jinotega',
+	},
+	{
+		country_short: 'VE',
+		region: 'Delta Amacuro',
+		city: 'Tucupita',
+	},
+	{
+		country_short: 'PA',
+		region: 'Darien',
+		city: 'Jaque',
+	},
+	{
+		country_short: 'SR',
+		region: 'Wanica',
+		city: 'Lelydorp',
+	},
+	{
+		country_short: 'SR',
+		region: 'Nickerie',
+		city: 'Nieuw Nickerie',
+	},
+	{
+		country_short: 'SR',
+		region: 'Brokopondo',
+		city: 'Brokopondo',
+	},
+	{
+		country_short: 'SR',
+		region: 'Commewijne',
+		city: 'Nieuw Amsterdam',
+	},
+	{
+		country_short: 'SR',
+		region: 'Sipaliwini',
+		city: 'Gonoe',
+	},
+	{
+		country_short: 'SR',
+		region: 'Saramacca',
+		city: 'Groningen',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Gadabay',
+		city: 'Kyadabek',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Saatli',
+		city: 'Ahmadbayli',
+	},
+	{
+		country_short: 'UZ',
+		region: 'Sirdaryo',
+		city: 'Guliston',
+	},
+	{
+		country_short: 'PA',
+		region: 'Guna Yala',
+		city: 'Airdirgandi',
+	},
+	{
+		country_short: 'GT',
+		region: 'El Progreso',
+		city: 'Guastatoya',
+	},
+	{
+		country_short: 'VE',
+		region: 'Dependencias Federales',
+		city: 'Punta de Garambeo',
+	},
+	{
+		country_short: 'GY',
+		region: 'Cuyuni-Mazaruni',
+		city: 'Bartica',
+	},
+	{
+		country_short: 'SR',
+		region: 'Coronie',
+		city: 'Totness',
+	},
+	{
+		country_short: 'HT',
+		region: 'Sud-Est',
+		city: 'Jacmel',
+	},
+	{
+		country_short: 'HT',
+		region: 'Nippes',
+		city: 'Miragoane',
+	},
+	{
+		country_short: 'NI',
+		region: 'Boaco',
+		city: 'Boaco',
+	},
+	{
+		country_short: 'SO',
+		region: 'Hiiraan',
+		city: 'Beledweyne',
+	},
+	{
+		country_short: 'SI',
+		region: 'Mislinja',
+		city: 'Mislinja',
+	},
+	{
+		country_short: 'SI',
+		region: 'Kobilje',
+		city: 'Kobilje',
+	},
+	{
+		country_short: 'SI',
+		region: 'Rogasovci',
+		city: 'Rogasovci',
+	},
+	{
+		country_short: 'EE',
+		region: 'Hiiumaa',
+		city: 'Kardla',
+	},
+	{
+		country_short: 'AX',
+		region: 'Jomala',
+		city: 'Jomala',
+	},
+	{
+		country_short: 'AX',
+		region: 'Eckeroe',
+		city: 'Eckero',
+	},
+	{
+		country_short: 'SI',
+		region: 'Mirna',
+		city: 'Mirna',
+	},
+	{
+		country_short: 'ME',
+		region: 'Cetinje',
+		city: 'Cetinje',
+	},
+	{
+		country_short: 'YE',
+		region: 'Shabwah',
+		city: "Al 'Aqir",
+	},
+	{
+		country_short: 'AZ',
+		region: 'Yardimli',
+		city: 'Yardimli',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint John Capisterre',
+		city: 'Tabernacle',
+	},
+	{
+		country_short: 'MZ',
+		region: 'Cabo Delgado',
+		city: 'Montepuez',
+	},
+	{
+		country_short: 'GM',
+		region: 'Upper River',
+		city: 'Basse Santa Su',
+	},
+	{
+		country_short: 'TG',
+		region: 'Savanes',
+		city: 'Sansanne-Mango',
+	},
+	{
+		country_short: 'TG',
+		region: 'Centrale',
+		city: 'Sotouboua',
+	},
+	{
+		country_short: 'ET',
+		region: 'Amara',
+		city: 'Debre Birhan',
+	},
+	{
+		country_short: 'ET',
+		region: 'Oromiya',
+		city: 'Bedele',
+	},
+	{
+		country_short: 'ET',
+		region: 'Tigray',
+		city: "Mek'ele",
+	},
+	{
+		country_short: 'ET',
+		region: 'Sumale',
+		city: 'Jijiga',
+	},
+	{
+		country_short: 'ET',
+		region: 'Dire Dawa',
+		city: 'Dire Dawa',
+	},
+	{
+		country_short: 'ET',
+		region: 'Afar',
+		city: 'Dubti',
+	},
+	{
+		country_short: 'ET',
+		region: 'YeDebub Biheroch Bihereseboch na Hizboch',
+		city: 'Boditi',
+	},
+	{
+		country_short: 'ET',
+		region: 'Binshangul Gumuz',
+		city: 'Asosa',
+	},
+	{
+		country_short: 'ET',
+		region: 'Gambela Hizboch',
+		city: 'Gambela',
+	},
+	{
+		country_short: 'AF',
+		region: 'Uruzgan',
+		city: 'Uruzgan',
+	},
+	{
+		country_short: 'LS',
+		region: 'Quthing',
+		city: 'Quthing',
+	},
+	{
+		country_short: 'MW',
+		region: 'Balaka',
+		city: 'Balaka',
+	},
+	{
+		country_short: 'CD',
+		region: 'Kwango',
+		city: 'Masina',
+	},
+	{
+		country_short: 'CD',
+		region: 'Haut-Lomami',
+		city: 'Bukama',
+	},
+	{
+		country_short: 'GN',
+		region: 'Fria',
+		city: 'Kimbo',
+	},
+	{
+		country_short: 'GN',
+		region: 'Mandiana',
+		city: 'Mandiana',
+	},
+	{
+		country_short: 'GN',
+		region: 'Boffa',
+		city: 'Boffa',
+	},
+	{
+		country_short: 'GN',
+		region: 'Labe',
+		city: 'Labe',
+	},
+	{
+		country_short: 'LS',
+		region: 'Mafeteng',
+		city: 'Mafeteng',
+	},
+	{
+		country_short: 'ET',
+		region: 'Hareri Hizb',
+		city: 'Harar',
+	},
+	{
+		country_short: 'SC',
+		region: 'Bel Ombre',
+		city: 'Bel Ombre',
+	},
+	{
+		country_short: 'SC',
+		region: 'Cascade',
+		city: 'Cascade',
+	},
+	{
+		country_short: 'LS',
+		region: "Mohale's Hoek",
+		city: "Mohale's Hoek",
+	},
+	{
+		country_short: 'LS',
+		region: 'Thaba-Tseka',
+		city: 'Thaba-Tseka',
+	},
+	{
+		country_short: 'LS',
+		region: 'Berea',
+		city: 'Teyateyaneng',
+	},
+	{
+		country_short: 'GW',
+		region: 'Oio',
+		city: 'Mansoa',
+	},
+	{
+		country_short: 'GW',
+		region: 'Gabu',
+		city: 'Gabu',
+	},
+	{
+		country_short: 'CG',
+		region: 'Niari',
+		city: 'Dolisie',
+	},
+	{
+		country_short: 'CG',
+		region: 'Bouenza',
+		city: 'Madingou',
+	},
+	{
+		country_short: 'SO',
+		region: 'Bay',
+		city: 'Baidoa',
+	},
+	{
+		country_short: 'SO',
+		region: 'Galguduud',
+		city: 'Dhuusamarreeb',
+	},
+	{
+		country_short: 'UG',
+		region: 'Oyam',
+		city: 'Oyam',
+	},
+	{
+		country_short: 'LR',
+		region: 'Bomi',
+		city: 'Tubmanburg',
+	},
+	{
+		country_short: 'SO',
+		region: 'Nugaal',
+		city: 'Garoowe',
+	},
+	{
+		country_short: 'SO',
+		region: 'Sanaag',
+		city: 'Laasqoray',
+	},
+	{
+		country_short: 'SS',
+		region: 'Lakes',
+		city: 'Rumbek',
+	},
+	{
+		country_short: 'NA',
+		region: 'Kavango West',
+		city: 'Nkurenkuru',
+	},
+	{
+		country_short: 'UG',
+		region: 'Namutumba',
+		city: 'Namutumba',
+	},
+	{
+		country_short: 'DJ',
+		region: 'Arta',
+		city: 'Arta',
+	},
+	{
+		country_short: 'DJ',
+		region: 'Dikhil',
+		city: 'Dikhil',
+	},
+	{
+		country_short: 'KM',
+		region: 'Moheli',
+		city: 'Ouanani',
+	},
+	{
+		country_short: 'SB',
+		region: 'Choiseul',
+		city: 'Mbatongo',
+	},
+	{
+		country_short: 'WS',
+		region: 'Gagaifomauga',
+		city: 'Matavai',
+	},
+	{
+		country_short: 'PG',
+		region: 'West Sepik',
+		city: 'Vanimo',
+	},
+	{
+		country_short: 'MN',
+		region: 'Ovorhangay',
+		city: 'Arvaikheer',
+	},
+	{
+		country_short: 'TO',
+		region: "'Eua",
+		city: 'Tufurai',
+	},
+	{
+		country_short: 'PH',
+		region: 'Apayao',
+		city: 'Kabugao',
+	},
+	{
+		country_short: 'PW',
+		region: 'Airai',
+		city: 'Ngetkib',
+	},
+	{
+		country_short: 'PW',
+		region: 'Ngardmau',
+		city: 'Ngardmau',
+	},
+	{
+		country_short: 'PW',
+		region: 'Kayangel',
+		city: 'Kayangel',
+	},
+	{
+		country_short: 'TO',
+		region: 'Niuas',
+		city: 'Falehau',
+	},
+	{
+		country_short: 'TO',
+		region: "Vava'u",
+		city: 'Neiafu',
+	},
+	{
+		country_short: 'LA',
+		region: 'Xaignabouli',
+		city: 'Ban Houakhoua',
+	},
+	{
+		country_short: 'BT',
+		region: 'Pema Gatshel',
+		city: 'Pemagatshel',
+	},
+	{
+		country_short: 'BT',
+		region: 'Gasa',
+		city: 'Gasa',
+	},
+	{
+		country_short: 'PG',
+		region: 'East New Britain',
+		city: 'Kokopo',
+	},
+	{
+		country_short: 'MN',
+		region: 'Bayanhongor',
+		city: 'Bayanhongor',
+	},
+	{
+		country_short: 'WS',
+		region: 'Atua',
+		city: 'Lotofaga',
+	},
+	{
+		country_short: 'NR',
+		region: 'Aiwo',
+		city: 'Arijejen',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint Peter Basseterre',
+		city: 'Canada',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint Anne Sandy Point',
+		city: 'Fig Tree',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint Joseph',
+		city: 'Salisbury',
+	},
+	{
+		country_short: 'DM',
+		region: 'Saint John',
+		city: 'Portsmouth',
+	},
+	{
+		country_short: 'KN',
+		region: 'Trinity Palmetto Point',
+		city: 'Challengers',
+	},
+	{
+		country_short: 'KN',
+		region: 'Saint Paul Capisterre',
+		city: 'Heldens',
+	},
+	{
+		country_short: 'LC',
+		region: 'Anse la Raye',
+		city: 'Anse La Raye',
+	},
+	{
+		country_short: 'AG',
+		region: 'Barbuda',
+		city: 'Codrington',
+	},
+	{
+		country_short: 'FJ',
+		region: 'Northern',
+		city: 'Labasa',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Daskasan',
+		city: 'Yukhary-Dashkesan',
+	},
+	{
+		country_short: 'AZ',
+		region: 'Haciqabul',
+		city: 'Aja Kabul',
+	},
+	{
+		country_short: 'MK',
+		region: 'Krusevo',
+		city: 'Krushevo',
+	},
+	{
+		country_short: 'AX',
+		region: 'Hammarland',
+		city: 'Hammarland',
+	},
+	{
+		country_short: 'AX',
+		region: 'Saltvik',
+		city: 'Saltvik',
+	},
+	{
+		country_short: 'AX',
+		region: 'Lemland',
+		city: 'Lemland',
+	},
+];
diff --git a/packages/js/product-editor/assets/icons/section_attributes.svg b/packages/js/product-editor/assets/icons/section_attributes.svg
deleted file mode 100644
index b94fc16fc06..00000000000
--- a/packages/js/product-editor/assets/icons/section_attributes.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19.545 14.4296L13.9351 20.0409C13.7898 20.1865 13.6172 20.3019 13.4272 20.3807C13.2373 20.4595 13.0336 20.5 12.828 20.5C12.6224 20.5 12.4187 20.4595 12.2288 20.3807C12.0388 20.3019 11.8662 20.1865 11.7209 20.0409L5 13.3261V5.5H12.8241L19.545 12.2226C19.8364 12.5159 20 12.9126 20 13.3261C20 13.7396 19.8364 14.1363 19.545 14.4296V14.4296Z" stroke="#1E1E1E" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<circle cx="9" cy="9.5" r="1" fill="#1E1E1E"/>
-</svg>
diff --git a/packages/js/product-editor/assets/icons/section_basic.svg b/packages/js/product-editor/assets/icons/section_basic.svg
deleted file mode 100644
index cf6a84b463c..00000000000
--- a/packages/js/product-editor/assets/icons/section_basic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" view-box="0 0 24 24">
-	<path
-		fill-rule="evenodd"
-		d="M5 5.5h14a.5.5 0 01.5.5v1.5a.5.5 0 01-.5.5H5a.5.5 0 01-.5-.5V6a.5.5 0 01.5-.5zM4 9.232A2 2 0 013 7.5V6a2 2 0 012-2h14a2 2 0 012 2v1.5a2 2 0 01-1 1.732V18a2 2 0 01-2 2H6a2 2 0 01-2-2V9.232zm1.5.268V18a.5.5 0 00.5.5h12a.5.5 0 00.5-.5V9.5h-13z"
-		clip-rule="evenodd"
-	/>
-</svg>
diff --git a/packages/js/product-editor/assets/icons/section_images.svg b/packages/js/product-editor/assets/icons/section_images.svg
deleted file mode 100644
index e48e5cad220..00000000000
--- a/packages/js/product-editor/assets/icons/section_images.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg view-box="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path
-		fill-rule="evenodd"
-		clip-rule="evenodd"
-		d="M19 5H5C4.72386 5 4.5 5.22386 4.5 5.5V19.5C4.5 19.7761 4.72386 20 5 20H19C19.2761 20 19.5 19.7761 19.5 19.5V5.5C19.5 5.22386 19.2761 5 19 5ZM5 3.5C3.89543 3.5 3 4.39543 3 5.5V19.5C3 20.6046 3.89543 21.5 5 21.5H19C20.1046 21.5 21 20.6046 21 19.5V5.5C21 4.39543 20.1046 3.5 19 3.5H5Z"
-		fill="#1E1E1E"
-	/>
-	<path
-		fill-rule="evenodd"
-		clip-rule="evenodd"
-		d="M15.4772 10.9623C15.7683 10.6792 16.2317 10.6792 16.5228 10.9623L20.5228 14.8511L19.4772 15.9266L16 12.546L12.5228 15.9266C12.2719 16.1706 11.8857 16.2086 11.5921 16.0183L8.59643 14.0766L4.44186 17.106L3.55811 15.894L8.12953 12.5607C8.38061 12.3776 8.71858 12.3683 8.97934 12.5373L11.906 14.4342L15.4772 10.9623Z"
-		fill="#1E1E1E"
-	/>
-</svg>
diff --git a/packages/js/product-editor/assets/icons/section_inventory.svg b/packages/js/product-editor/assets/icons/section_inventory.svg
deleted file mode 100644
index 5f130b2abd6..00000000000
--- a/packages/js/product-editor/assets/icons/section_inventory.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg view-box="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path
-		fill-rule="evenodd"
-		clip-rule="evenodd"
-		d="M6 6H18C18.2761 6 18.5 6.22386 18.5 6.5V13.5H15.5H14C14 14.6046 13.1046 15.5 12 15.5C10.8954 15.5 10 14.6046 10 13.5H8.5H5.5V6.5C5.5 6.22386 5.72386 6 6 6ZM5.5 15V18.5C5.5 18.7761 5.72386 19 6 19H18C18.2761 19 18.5 18.7761 18.5 18.5V15H15.1632C14.6015 16.1825 13.3962 17 12 17C10.6038 17 9.39855 16.1825 8.83682 15H5.5ZM4 13.5V6.5C4 5.39543 4.89543 4.5 6 4.5H18C19.1046 4.5 20 5.39543 20 6.5V13.5V15V18.5C20 19.6046 19.1046 20.5 18 20.5H6C4.89543 20.5 4 19.6046 4 18.5V15V13.5Z"
-		fill="#1E1E1E"
-	/>
-</svg>
diff --git a/packages/js/product-editor/assets/icons/section_pricing.svg b/packages/js/product-editor/assets/icons/section_pricing.svg
deleted file mode 100644
index 46e2ee12101..00000000000
--- a/packages/js/product-editor/assets/icons/section_pricing.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" view-box="0 0 24 24">
-	<path
-		fill-rule="evenodd"
-		d="M16.83 6.342l.602.3.625-.25.443-.176v12.569l-.443-.178-.625-.25-.603.301-1.444.723-2.41-.804-.475-.158-.474.158-2.41.803-1.445-.722-.603-.3-.625.25-.443.177V6.215l.443.178.625.25.603-.301 1.444-.722 2.41.803.475.158.474-.158 2.41-.803 1.445.722zM20 4l-1.5.6-1 .4-2-1-3 1-3-1-2 1-1-.4L5 4v17l1.5-.6 1-.4 2 1 3-1 3 1 2-1 1 .4 1.5.6V4zm-3.5 6.25v-1.5h-8v1.5h8zm0 3v-1.5h-8v1.5h8zm-8 3v-1.5h8v1.5h-8z"
-		clip-rule="evenodd"
-	/>
-</svg>
diff --git a/packages/js/product-editor/assets/icons/section_shipping.svg b/packages/js/product-editor/assets/icons/section_shipping.svg
deleted file mode 100644
index f7289a1f9c9..00000000000
--- a/packages/js/product-editor/assets/icons/section_shipping.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg view-box="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path
-		fill-rule="evenodd"
-		clip-rule="evenodd"
-		d="M3.5 7.75C3.5 6.7835 4.2835 6 5.25 6H14.75H15.5V6.75V9H17.25H17.5607L17.7803 9.21967L20.7803 12.2197L21 12.4393V12.75V14.75C21 15.7165 20.2165 16.5 19.25 16.5H19.2377C19.2458 16.5822 19.25 16.6656 19.25 16.75C19.25 18.1307 18.1307 19.25 16.75 19.25C15.3693 19.25 14.25 18.1307 14.25 16.75C14.25 16.6656 14.2542 16.5822 14.2623 16.5H14H10.2377C10.2458 16.5822 10.25 16.6656 10.25 16.75C10.25 18.1307 9.13071 19.25 7.75 19.25C6.36929 19.25 5.25 18.1307 5.25 16.75C5.25 16.6656 5.25418 16.5822 5.26234 16.5H4.25H3.5V15.75V7.75ZM14 15V9.75V9V7.5H5.25C5.11193 7.5 5 7.61193 5 7.75V15H5.96464C6.41837 14.5372 7.05065 14.25 7.75 14.25C8.44935 14.25 9.08163 14.5372 9.53536 15H14ZM18.5354 15H19.25C19.3881 15 19.5 14.8881 19.5 14.75V13.0607L16.9393 10.5H15.5V14.5845C15.8677 14.3717 16.2946 14.25 16.75 14.25C17.4493 14.25 18.0816 14.5372 18.5354 15ZM6.7815 16.5C6.76094 16.5799 6.75 16.6637 6.75 16.75C6.75 17.3023 7.19772 17.75 7.75 17.75C8.30228 17.75 8.75 17.3023 8.75 16.75C8.75 16.6637 8.73906 16.5799 8.7185 16.5C8.60749 16.0687 8.21596 15.75 7.75 15.75C7.28404 15.75 6.89251 16.0687 6.7815 16.5ZM15.7815 16.5C15.7609 16.5799 15.75 16.6637 15.75 16.75C15.75 17.3023 16.1977 17.75 16.75 17.75C17.3023 17.75 17.75 17.3023 17.75 16.75C17.75 16.6637 17.7391 16.5799 17.7185 16.5C17.7144 16.4841 17.7099 16.4683 17.705 16.4526C17.5784 16.0456 17.1987 15.75 16.75 15.75C16.284 15.75 15.8925 16.0687 15.7815 16.5Z"
-		fill="#1E1E1E"
-	/>
-</svg>
diff --git a/packages/js/product-editor/changelog/add-37984 b/packages/js/product-editor/changelog/add-37984
new file mode 100644
index 00000000000..6a9cf362045
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-37984
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Fix validation behavior#37984
diff --git a/packages/js/product-editor/changelog/add-37985 b/packages/js/product-editor/changelog/add-37985
new file mode 100644
index 00000000000..fc2c2d5017d
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-37985
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add Sale price validation#37985
diff --git a/packages/js/product-editor/changelog/add-38044 b/packages/js/product-editor/changelog/add-38044
new file mode 100644
index 00000000000..25b146641e5
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-38044
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Update shipping class block to match new designs#38044
diff --git a/packages/js/product-editor/changelog/add-38097 b/packages/js/product-editor/changelog/add-38097
new file mode 100644
index 00000000000..e70778d9952
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-38097
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix spacing between pricing fields
diff --git a/packages/js/product-editor/changelog/add-38200 b/packages/js/product-editor/changelog/add-38200
new file mode 100644
index 00000000000..9cee901e3f9
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-38200
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Only register blocks when user navigates to the product edit page#38200
diff --git a/packages/js/product-editor/changelog/add-38215 b/packages/js/product-editor/changelog/add-38215
new file mode 100644
index 00000000000..019abe10811
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-38215
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add error specific messages to product save functionality
diff --git a/packages/js/product-editor/changelog/add-38248 b/packages/js/product-editor/changelog/add-38248
new file mode 100644
index 00000000000..937374bdd35
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-38248
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Make DateTimePickerControl a ForwardedRef
diff --git a/packages/js/product-editor/changelog/fix-37956 b/packages/js/product-editor/changelog/fix-37956
new file mode 100644
index 00000000000..57e418f138f
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-37956
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Fix summary toolbar positioning and selection on blur
diff --git a/packages/js/product-editor/changelog/fix-38020 b/packages/js/product-editor/changelog/fix-38020
new file mode 100644
index 00000000000..d45ce96e163
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-38020
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Prevent double debouncing of iframe editor callback
diff --git a/packages/js/product-editor/changelog/fix-38020-2 b/packages/js/product-editor/changelog/fix-38020-2
new file mode 100644
index 00000000000..3f2c4d7befe
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-38020-2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Wait for editor changes to be debounced before closing modal
diff --git a/packages/js/product-editor/changelog/fix-38021 b/packages/js/product-editor/changelog/fix-38021
new file mode 100644
index 00000000000..6df229ebaf4
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-38021
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Add editor styles to product editor and iframe editor
diff --git a/packages/js/product-editor/changelog/fix-38149 b/packages/js/product-editor/changelog/fix-38149
new file mode 100644
index 00000000000..f793db4eeff
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-38149
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Fix double scrollbars on product editor page
diff --git a/packages/js/product-editor/changelog/fix-38221 b/packages/js/product-editor/changelog/fix-38221
new file mode 100644
index 00000000000..7c98399959a
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-38221
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+List price gets reset on blur when error is shown#38221
diff --git a/packages/js/product-editor/changelog/fix-38242_editor_hidden_in_firefox b/packages/js/product-editor/changelog/fix-38242_editor_hidden_in_firefox
new file mode 100644
index 00000000000..9dd9e2a4c53
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-38242_editor_hidden_in_firefox
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Remove css unrelated to the product block editor.
diff --git a/packages/js/product-editor/changelog/fix-38244 b/packages/js/product-editor/changelog/fix-38244
new file mode 100644
index 00000000000..627bbf74773
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-38244
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Limit 'email me when stock reaches' field to numerical only#38244
diff --git a/packages/js/product-editor/changelog/fix-image-section-spacing b/packages/js/product-editor/changelog/fix-image-section-spacing
new file mode 100644
index 00000000000..0075e40523d
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-image-section-spacing
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixing spacing when no images added on image gallery block.
diff --git a/packages/js/product-editor/changelog/fix-product-summary-field-margin b/packages/js/product-editor/changelog/fix-product-summary-field-margin
new file mode 100644
index 00000000000..2233dd7dfc2
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-product-summary-field-margin
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix product summary field margin.
diff --git a/packages/js/product-editor/changelog/fix-tabbed-navigation-37932 b/packages/js/product-editor/changelog/fix-tabbed-navigation-37932
new file mode 100644
index 00000000000..b71572676df
--- /dev/null
+++ b/packages/js/product-editor/changelog/fix-tabbed-navigation-37932
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Removing WritingFlow component which was suppressing tabbing behavior in form.
diff --git a/packages/js/product-editor/changelog/update-37727 b/packages/js/product-editor/changelog/update-37727
new file mode 100644
index 00000000000..4068fbbe7cc
--- /dev/null
+++ b/packages/js/product-editor/changelog/update-37727
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Fix broken assertion with comma separated list in category select control
diff --git a/packages/js/product-editor/changelog/update-37955_disable_drag_and_drop_images_block b/packages/js/product-editor/changelog/update-37955_disable_drag_and_drop_images_block
new file mode 100644
index 00000000000..d80356e5bbb
--- /dev/null
+++ b/packages/js/product-editor/changelog/update-37955_disable_drag_and_drop_images_block
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Disable dragging and dropping of images within Product Images block.
diff --git a/packages/js/product-editor/changelog/update-38043 b/packages/js/product-editor/changelog/update-38043
new file mode 100644
index 00000000000..1a5161be088
--- /dev/null
+++ b/packages/js/product-editor/changelog/update-38043
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update shipping dimensions image in new product blocks editor
diff --git a/packages/js/product-editor/changelog/update-38117 b/packages/js/product-editor/changelog/update-38117
new file mode 100644
index 00000000000..a4b7eb7f667
--- /dev/null
+++ b/packages/js/product-editor/changelog/update-38117
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Remove drag and drop handle in product blocks editor
diff --git a/packages/js/product-editor/changelog/update-38260 b/packages/js/product-editor/changelog/update-38260
new file mode 100644
index 00000000000..ff527f97de7
--- /dev/null
+++ b/packages/js/product-editor/changelog/update-38260
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Adjust styling based on internal styling feedback
diff --git a/packages/js/product-editor/changelog/update-parent-categ b/packages/js/product-editor/changelog/update-parent-categ
new file mode 100644
index 00000000000..7f05c6c10a5
--- /dev/null
+++ b/packages/js/product-editor/changelog/update-parent-categ
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Use SelectTree in the Parent Category field
diff --git a/packages/js/product-editor/src/blocks/attributes/editor.scss b/packages/js/product-editor/src/blocks/attributes/editor.scss
index 4bb5af8a006..199ada5b2d3 100644
--- a/packages/js/product-editor/src/blocks/attributes/editor.scss
+++ b/packages/js/product-editor/src/blocks/attributes/editor.scss
@@ -1,21 +1,18 @@
-.wp-block-woocommerce-product-images-field {
-	.woocommerce-image-gallery {
-		margin-top: $gap-largest;
+.wp-block-woocommerce-product-attributes-field {
+	.woocommerce-sortable {
+		padding: 0;
 	}
-    .woocommerce-media-uploader {
-        text-align: left;
-    }
-    .woocommerce-media-uploader__label {
+
+	.woocommerce-list-item {
+		background: none;
+		border: none;
+		border-bottom: 1px solid $gray-200;
+		padding-left: 0;
+        grid-template-columns: 26% auto 90px;
+	}
+
+    .woocommerce-sortable__handle {
         display: none;
     }
-    .woocommerce-sortable {
-        margin-top: 0;
-        padding: 0;
-    }
 
-    &:not(.has-images) {
-        .woocommerce-sortable {
-            display: none;
-        }
-    }
 }
diff --git a/packages/js/product-editor/src/blocks/checkbox/edit.tsx b/packages/js/product-editor/src/blocks/checkbox/edit.tsx
index 64655ac5d89..ff22d1d2335 100644
--- a/packages/js/product-editor/src/blocks/checkbox/edit.tsx
+++ b/packages/js/product-editor/src/blocks/checkbox/edit.tsx
@@ -45,7 +45,7 @@ export function Edit( { attributes }: { attributes: BlockAttributes } ) {
 										<span className="woocommerce-product-form__checkbox-tooltip-icon">
 											<Icon
 												icon={ help }
-												size={ 20 }
+												size={ 22 }
 												fill="#949494"
 											/>
 										</span>
diff --git a/packages/js/product-editor/src/blocks/checkbox/editor.scss b/packages/js/product-editor/src/blocks/checkbox/editor.scss
index 472ffb521b5..4e295624fa8 100644
--- a/packages/js/product-editor/src/blocks/checkbox/editor.scss
+++ b/packages/js/product-editor/src/blocks/checkbox/editor.scss
@@ -3,6 +3,7 @@
 
 	.components-base-control__field {
 		display: flex;
+		align-items: center;
 	}
 
 	.components-checkbox-control__label {
@@ -11,6 +12,8 @@
 
 	&-tooltip-icon {
 		margin: -2px 0 0 $gap-small;
+		display: flex;
+		align-items: center;
 	}
 }
 
diff --git a/packages/js/product-editor/src/blocks/images/edit.tsx b/packages/js/product-editor/src/blocks/images/edit.tsx
index 16ee7e69385..07a6975093a 100644
--- a/packages/js/product-editor/src/blocks/images/edit.tsx
+++ b/packages/js/product-editor/src/blocks/images/edit.tsx
@@ -114,6 +114,7 @@ export function Edit() {
 				) }
 			</div>
 			<ImageGallery
+				allowDragging={ false }
 				onDragStart={ ( event ) => {
 					const { id: imageId, dataset } =
 						event.target as HTMLElement;
@@ -150,11 +151,12 @@ export function Edit() {
 						images.find( ( img ) => media.id === img.id ) ===
 						undefined
 					) {
-						images[ replaceIndex ] = media as MediaItem;
+						const newImages = [ ...images ];
+						newImages[ replaceIndex ] = media as MediaItem;
 						recordEvent(
 							'product_images_replace_image_button_click'
 						);
-						setImages( images );
+						setImages( newImages );
 					}
 				} }
 				onSelectAsCover={ () =>
diff --git a/packages/js/product-editor/src/blocks/images/editor.scss b/packages/js/product-editor/src/blocks/images/editor.scss
index 4bb5af8a006..5ab57eb05e6 100644
--- a/packages/js/product-editor/src/blocks/images/editor.scss
+++ b/packages/js/product-editor/src/blocks/images/editor.scss
@@ -1,7 +1,4 @@
 .wp-block-woocommerce-product-images-field {
-	.woocommerce-image-gallery {
-		margin-top: $gap-largest;
-	}
     .woocommerce-media-uploader {
         text-align: left;
     }
@@ -13,6 +10,12 @@
         padding: 0;
     }
 
+	&.has-images {
+		.woocommerce-image-gallery {
+			margin-top: $gap-largest;
+		}
+	}
+
     &:not(.has-images) {
         .woocommerce-sortable {
             display: none;
diff --git a/packages/js/product-editor/src/blocks/index.ts b/packages/js/product-editor/src/blocks/index.ts
index cb3b4298c0d..78db019ef1d 100644
--- a/packages/js/product-editor/src/blocks/index.ts
+++ b/packages/js/product-editor/src/blocks/index.ts
@@ -9,10 +9,12 @@ export { init as initSku } from './inventory-sku';
 export { init as initName } from './name';
 export { init as initPricing } from './pricing';
 export { init as initRadio } from './radio';
+export { init as initRegularPrice } from './regular-price';
+export { init as initSalePrice } from './sale-price';
 export { init as initScheduleSale } from './schedule-sale';
 export { init as initSection } from './section';
+export { init as initShippingClass } from './shipping-class';
 export { init as initShippingDimensions } from './shipping-dimensions';
-export { init as initShippingFee } from './shipping-fee';
 export { init as initSummary } from './summary';
 export { init as initTab } from './tab';
 export { init as initInventoryQuantity } from './inventory-quantity';
diff --git a/packages/js/product-editor/src/blocks/inventory-email/edit.tsx b/packages/js/product-editor/src/blocks/inventory-email/edit.tsx
index ead26d92099..916b885e33b 100644
--- a/packages/js/product-editor/src/blocks/inventory-email/edit.tsx
+++ b/packages/js/product-editor/src/blocks/inventory-email/edit.tsx
@@ -3,16 +3,16 @@
  */
 import { __, sprintf } from '@wordpress/i18n';
 import { Link } from '@woocommerce/components';
-
+import { Product } from '@woocommerce/data';
 import {
 	createElement,
 	Fragment,
 	createInterpolateElement,
 } from '@wordpress/element';
 import { getSetting } from '@woocommerce/settings';
-
+import { BlockEditProps } from '@wordpress/blocks';
 import { useBlockProps } from '@wordpress/block-editor';
-
+import { useInstanceId } from '@wordpress/compose';
 import {
 	BaseControl,
 	// @ts-expect-error `__experimentalInputControl` does exist.
@@ -23,54 +23,91 @@ import {
 // eslint-disable-next-line @woocommerce/dependency-group
 import { useEntityProp } from '@wordpress/core-data';
 
-export function Edit() {
+/**
+ * Internal dependencies
+ */
+import { useValidation } from '../../contexts/validation-context';
+import { InventoryEmailBlockAttributes } from './types';
+
+export function Edit( {
+	clientId,
+}: BlockEditProps< InventoryEmailBlockAttributes > ) {
 	const blockProps = useBlockProps();
 	const notifyLowStockAmount = getSetting( 'notifyLowStockAmount', 2 );
 
-	const [ lowStockAmount, setLowStockAmount ] = useEntityProp(
+	const [ lowStockAmount, setLowStockAmount ] = useEntityProp< number >(
 		'postType',
 		'product',
 		'low_stock_amount'
 	);
 
+	const id = useInstanceId( BaseControl, 'low_stock_amount' ) as string;
+
+	const {
+		ref: lowStockAmountRef,
+		error: lowStockAmountValidationError,
+		validate: validateLowStockAmount,
+	} = useValidation< Product >(
+		`low_stock_amount-${ clientId }`,
+		async function stockQuantityValidator() {
+			if ( lowStockAmount && lowStockAmount < 0 ) {
+				return __(
+					'This field must be a positive number.',
+					'woocommerce'
+				);
+			}
+		},
+		[ lowStockAmount ]
+	);
+
 	return (
 		<>
 			<div { ...blockProps }>
 				<div className="wp-block-columns">
 					<div className="wp-block-column">
 						<BaseControl
-							id={ 'product_inventory_email' }
+							id={ id }
 							label={ __(
 								'Email me when stock reaches',
 								'woocommerce'
 							) }
-							help={ createInterpolateElement(
-								__(
-									'Make sure to enable notifications in <link>store settings.</link>',
-									'woocommerce'
-								),
-								{
-									link: (
-										<Link
-											href={ `${ getSetting(
-												'adminUrl'
-											) }admin.php?page=wc-settings&tab=products&section=inventory` }
-											target="_blank"
-											type="external"
-										></Link>
+							help={
+								lowStockAmountValidationError ||
+								createInterpolateElement(
+									__(
+										'Make sure to enable notifications in <link>store settings.</link>',
+										'woocommerce'
 									),
-								}
-							) }
+									{
+										link: (
+											<Link
+												href={ `${ getSetting(
+													'adminUrl'
+												) }admin.php?page=wc-settings&tab=products&section=inventory` }
+												target="_blank"
+												type="external"
+											></Link>
+										),
+									}
+								)
+							}
+							className={
+								lowStockAmountValidationError && 'has-error'
+							}
 						>
 							<InputControl
-								name={ 'woocommerce-product-name' }
+								id={ id }
+								ref={ lowStockAmountRef }
+								name={ 'low_stock_amount' }
 								placeholder={ sprintf(
 									// translators: Default quantity to notify merchants of low stock.
 									__( '%d (store default)', 'woocommerce' ),
 									notifyLowStockAmount
 								) }
 								onChange={ setLowStockAmount }
+								onBlur={ validateLowStockAmount }
 								value={ lowStockAmount }
+								type="number"
 								min={ 0 }
 							/>
 						</BaseControl>
diff --git a/packages/js/product-editor/src/blocks/inventory-email/index.ts b/packages/js/product-editor/src/blocks/inventory-email/index.ts
index 59d35906a12..f022db49254 100644
--- a/packages/js/product-editor/src/blocks/inventory-email/index.ts
+++ b/packages/js/product-editor/src/blocks/inventory-email/index.ts
@@ -1,22 +1,29 @@
+/**
+ * External dependencies
+ */
+import { createElement } from '@wordpress/element';
+import { BlockConfiguration } from '@wordpress/blocks';
+
 /**
  * Internal dependencies
  */
-import { initBlock } from '../../utils';
-import metadata from './block.json';
+import { initBlock } from '../../utils/init-blocks';
+import blockConfiguration from './block.json';
 import { Edit } from './edit';
+import { InventoryEmailBlockAttributes } from './types';
 
-const { name } = metadata;
+const { name, ...metadata } =
+	blockConfiguration as BlockConfiguration< InventoryEmailBlockAttributes >;
 
 export { metadata, name };
 
-export const settings = {
+export const settings: Partial<
+	BlockConfiguration< InventoryEmailBlockAttributes >
+> = {
 	example: {},
 	edit: Edit,
 };
 
-export const init = () =>
-	initBlock( {
-		name,
-		metadata: metadata as never,
-		settings,
-	} );
+export function init() {
+	return initBlock( { name, metadata, settings } );
+}
diff --git a/packages/js/product-editor/src/blocks/inventory-email/types.ts b/packages/js/product-editor/src/blocks/inventory-email/types.ts
new file mode 100644
index 00000000000..a34d55343f5
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/inventory-email/types.ts
@@ -0,0 +1,8 @@
+/**
+ * External dependencies
+ */
+import { BlockAttributes } from '@wordpress/blocks';
+
+export interface InventoryEmailBlockAttributes extends BlockAttributes {
+	name: string;
+}
diff --git a/packages/js/product-editor/src/blocks/inventory-quantity/edit.tsx b/packages/js/product-editor/src/blocks/inventory-quantity/edit.tsx
index 84ae08c9aa6..935e7d1bc30 100644
--- a/packages/js/product-editor/src/blocks/inventory-quantity/edit.tsx
+++ b/packages/js/product-editor/src/blocks/inventory-quantity/edit.tsx
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { Product } from '@woocommerce/data';
 import { BlockEditProps } from '@wordpress/blocks';
 import { useBlockProps } from '@wordpress/block-editor';
 import { useInstanceId } from '@wordpress/compose';
@@ -17,10 +18,11 @@ import {
  * Internal dependencies
  */
 import { TrackInventoryBlockAttributes } from './types';
+import { useValidation } from '../../contexts/validation-context';
 
-import { useValidation } from '../../hooks/use-validation';
-
-export function Edit( {}: BlockEditProps< TrackInventoryBlockAttributes > ) {
+export function Edit( {
+	clientId,
+}: BlockEditProps< TrackInventoryBlockAttributes > ) {
 	const blockProps = useBlockProps();
 
 	const [ manageStock ] = useEntityProp< boolean >(
@@ -40,16 +42,21 @@ export function Edit( {}: BlockEditProps< TrackInventoryBlockAttributes > ) {
 		'product_stock_quantity'
 	) as string;
 
-	const stockQuantityValidationError = useValidation(
-		'product/stock_quantity',
-		function stockQuantityValidator() {
+	const {
+		ref: stockQuantityRef,
+		error: stockQuantityValidationError,
+		validate: validateStockQuantity,
+	} = useValidation< Product >(
+		`stock_quantity-${ clientId }`,
+		async function stockQuantityValidator() {
 			if ( manageStock && stockQuantity && stockQuantity < 0 ) {
 				return __(
 					'Stock quantity must be a positive number.',
 					'woocommerce'
 				);
 			}
-		}
+		},
+		[ manageStock, stockQuantity ]
 	);
 
 	useEffect( () => {
@@ -72,9 +79,11 @@ export function Edit( {}: BlockEditProps< TrackInventoryBlockAttributes > ) {
 						<InputControl
 							id={ stockQuantityId }
 							name="stock_quantity"
+							ref={ stockQuantityRef }
 							label={ __( 'Available quantity', 'woocommerce' ) }
 							value={ stockQuantity }
 							onChange={ setStockQuantity }
+							onBlur={ validateStockQuantity }
 							type="number"
 							min={ 0 }
 						/>
diff --git a/packages/js/product-editor/src/blocks/name/edit.tsx b/packages/js/product-editor/src/blocks/name/edit.tsx
index d1c257c6b22..753e9f8db79 100644
--- a/packages/js/product-editor/src/blocks/name/edit.tsx
+++ b/packages/js/product-editor/src/blocks/name/edit.tsx
@@ -35,7 +35,7 @@ import { useEntityProp, useEntityId } from '@wordpress/core-data';
  */
 import { AUTO_DRAFT_NAME } from '../../utils';
 import { EditProductLinkModal } from '../../components/edit-product-link-modal';
-import { useValidation } from '../../hooks/use-validation';
+import { useValidation } from '../../contexts/validation-context';
 
 export function Edit() {
 	const blockProps = useBlockProps();
@@ -77,9 +77,13 @@ export function Edit() {
 		}
 	);
 
-	const nameValidationError = useValidation(
-		'product/name',
-		function nameValidator() {
+	const {
+		ref: nameRef,
+		error: nameValidationError,
+		validate: validateName,
+	} = useValidation< Product >(
+		'name',
+		async function nameValidator() {
 			if ( ! name || name === AUTO_DRAFT_NAME ) {
 				return __( 'This field is required.', 'woocommerce' );
 			}
@@ -90,7 +94,8 @@ export function Edit() {
 					'woocommerce'
 				);
 			}
-		}
+		},
+		[ name ]
 	);
 
 	const setSkuIfEmpty = () => {
@@ -153,6 +158,7 @@ export function Edit() {
 				>
 					<InputControl
 						id={ nameControlId }
+						ref={ nameRef }
 						name="name"
 						placeholder={ __(
 							'e.g. 12 oz Coffee Mug',
@@ -160,7 +166,10 @@ export function Edit() {
 						) }
 						onChange={ setName }
 						value={ name && name !== AUTO_DRAFT_NAME ? name : '' }
-						onBlur={ setSkuIfEmpty }
+						onBlur={ () => {
+							setSkuIfEmpty();
+							validateName();
+						} }
 					/>
 				</BaseControl>
 
diff --git a/packages/js/product-editor/src/blocks/pricing/edit.tsx b/packages/js/product-editor/src/blocks/pricing/edit.tsx
index ca4291243b0..4aeade0ae4d 100644
--- a/packages/js/product-editor/src/blocks/pricing/edit.tsx
+++ b/packages/js/product-editor/src/blocks/pricing/edit.tsx
@@ -2,18 +2,13 @@
  * External dependencies
  */
 import { Link } from '@woocommerce/components';
-import { CurrencyContext } from '@woocommerce/currency';
 import { getNewPath } from '@woocommerce/navigation';
 import { recordEvent } from '@woocommerce/tracks';
 import { useBlockProps } from '@wordpress/block-editor';
 import { BlockEditProps } from '@wordpress/blocks';
 import { useInstanceId } from '@wordpress/compose';
 import { useEntityProp } from '@wordpress/core-data';
-import {
-	createElement,
-	useContext,
-	createInterpolateElement,
-} from '@wordpress/element';
+import { createElement, createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import {
 	BaseControl,
@@ -25,7 +20,6 @@ import {
  * Internal dependencies
  */
 import { useCurrencyInputProps } from '../../hooks/use-currency-input-props';
-import { formatCurrencyDisplayValue } from '../../utils';
 import { PricingBlockAttributes } from './types';
 
 export function Edit( {
@@ -38,12 +32,9 @@ export function Edit( {
 		'product',
 		name
 	);
-	const context = useContext( CurrencyContext );
-	const { getCurrencyConfig, formatAmount } = context;
-	const currencyConfig = getCurrencyConfig();
 	const inputProps = useCurrencyInputProps( {
 		value: price,
-		setValue: setPrice,
+		onChange: setPrice,
 	} );
 
 	const interpolatedHelp = help
@@ -71,13 +62,7 @@ export function Edit( {
 					{ ...inputProps }
 					id={ priceId }
 					name={ name }
-					onChange={ setPrice }
 					label={ label || __( 'Price', 'woocommerce' ) }
-					value={ formatCurrencyDisplayValue(
-						String( price ),
-						currencyConfig,
-						formatAmount
-					) }
 				/>
 			</BaseControl>
 		</div>
diff --git a/packages/js/product-editor/src/blocks/regular-price/block.json b/packages/js/product-editor/src/blocks/regular-price/block.json
new file mode 100644
index 00000000000..70c3c995030
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/regular-price/block.json
@@ -0,0 +1,29 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "woocommerce/product-regular-price-field",
+	"description": "A product price block with currency display.",
+	"title": "Product regular price",
+	"category": "widgets",
+	"keywords": [ "products", "price" ],
+	"textdomain": "default",
+	"attributes": {
+		"label": {
+			"type": "string",
+			"__experimentalRole": "content"
+		},
+		"help": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"align": false,
+		"html": false,
+		"multiple": false,
+		"reusable": false,
+		"inserter": false,
+		"lock": false,
+		"__experimentalToolbar": false
+	},
+	"editorStyle": "file:./editor.css"
+}
diff --git a/packages/js/product-editor/src/blocks/regular-price/edit.tsx b/packages/js/product-editor/src/blocks/regular-price/edit.tsx
new file mode 100644
index 00000000000..9090de1adba
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/regular-price/edit.tsx
@@ -0,0 +1,120 @@
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+import { Link } from '@woocommerce/components';
+import { Product } from '@woocommerce/data';
+import { getNewPath } from '@woocommerce/navigation';
+import { recordEvent } from '@woocommerce/tracks';
+import { useBlockProps } from '@wordpress/block-editor';
+import { BlockEditProps } from '@wordpress/blocks';
+import { useInstanceId } from '@wordpress/compose';
+import { useEntityProp } from '@wordpress/core-data';
+import { createElement, createInterpolateElement } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import {
+	BaseControl,
+	// @ts-expect-error `__experimentalInputControl` does exist.
+	__experimentalInputControl as InputControl,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { useValidation } from '../../contexts/validation-context';
+import { useCurrencyInputProps } from '../../hooks/use-currency-input-props';
+import { SalePriceBlockAttributes } from './types';
+
+export function Edit( {
+	attributes,
+	clientId,
+}: BlockEditProps< SalePriceBlockAttributes > ) {
+	const blockProps = useBlockProps();
+	const { label, help } = attributes;
+	const [ regularPrice, setRegularPrice ] = useEntityProp< string >(
+		'postType',
+		'product',
+		'regular_price'
+	);
+	const [ salePrice ] = useEntityProp< string >(
+		'postType',
+		'product',
+		'sale_price'
+	);
+	const inputProps = useCurrencyInputProps( {
+		value: regularPrice,
+		onChange: setRegularPrice,
+	} );
+
+	const interpolatedHelp = help
+		? createInterpolateElement( help, {
+				PricingTab: (
+					<Link
+						href={ getNewPath( { tab: 'pricing' } ) }
+						onClick={ () => {
+							recordEvent( 'product_pricing_help_click' );
+						} }
+					/>
+				),
+		  } )
+		: null;
+
+	const regularPriceId = useInstanceId(
+		BaseControl,
+		'wp-block-woocommerce-product-regular-price-field'
+	) as string;
+
+	const {
+		ref: regularPriceRef,
+		error: regularPriceValidationError,
+		validate: validateRegularPrice,
+	} = useValidation< Product >(
+		`regular_price-${ clientId }`,
+		async function regularPriceValidator() {
+			const listPrice = Number.parseFloat( regularPrice );
+			if ( listPrice ) {
+				if ( listPrice < 0 ) {
+					return __(
+						'List price must be greater than or equals to zero.',
+						'woocommerce'
+					);
+				}
+				if (
+					salePrice &&
+					listPrice <= Number.parseFloat( salePrice )
+				) {
+					return __(
+						'List price must be greater than the sale price.',
+						'woocommerce'
+					);
+				}
+			}
+		},
+		[ regularPrice, salePrice ]
+	);
+
+	return (
+		<div { ...blockProps }>
+			<BaseControl
+				id={ regularPriceId }
+				help={
+					regularPriceValidationError
+						? regularPriceValidationError
+						: interpolatedHelp
+				}
+				className={ classNames( {
+					'has-error': regularPriceValidationError,
+				} ) }
+			>
+				<InputControl
+					{ ...inputProps }
+					id={ regularPriceId }
+					name={ 'regular_price' }
+					ref={ regularPriceRef }
+					label={ label }
+					onBlur={ validateRegularPrice }
+				/>
+			</BaseControl>
+		</div>
+	);
+}
diff --git a/packages/js/product-editor/src/blocks/regular-price/editor.scss b/packages/js/product-editor/src/blocks/regular-price/editor.scss
new file mode 100644
index 00000000000..9115cf687cd
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/regular-price/editor.scss
@@ -0,0 +1,11 @@
+.wp-block-woocommerce-product-regular-price-field {
+	.components-currency-control {
+		.components-input-control__prefix {
+			color: $gray-700;
+		}
+
+		.components-input-control__input {
+			text-align: right;
+		}
+	}
+}
\ No newline at end of file
diff --git a/packages/js/product-editor/src/blocks/regular-price/index.ts b/packages/js/product-editor/src/blocks/regular-price/index.ts
new file mode 100644
index 00000000000..f838788b632
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/regular-price/index.ts
@@ -0,0 +1,28 @@
+/**
+ * External dependencies
+ */
+import { BlockConfiguration } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { initBlock } from '../../utils/init-blocks';
+import blockConfiguration from './block.json';
+import { Edit } from './edit';
+import { SalePriceBlockAttributes } from './types';
+
+const { name, ...metadata } =
+	blockConfiguration as BlockConfiguration< SalePriceBlockAttributes >;
+
+export { metadata, name };
+
+export const settings: Partial<
+	BlockConfiguration< SalePriceBlockAttributes >
+> = {
+	example: {},
+	edit: Edit,
+};
+
+export function init() {
+	return initBlock( { name, metadata, settings } );
+}
diff --git a/packages/js/product-editor/src/blocks/regular-price/types.ts b/packages/js/product-editor/src/blocks/regular-price/types.ts
new file mode 100644
index 00000000000..99ceaa60e80
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/regular-price/types.ts
@@ -0,0 +1,9 @@
+/**
+ * External dependencies
+ */
+import { BlockAttributes } from '@wordpress/blocks';
+
+export interface SalePriceBlockAttributes extends BlockAttributes {
+	label: string;
+	help?: string;
+}
diff --git a/packages/js/product-editor/src/blocks/sale-price/block.json b/packages/js/product-editor/src/blocks/sale-price/block.json
new file mode 100644
index 00000000000..51babacca28
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/sale-price/block.json
@@ -0,0 +1,29 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "woocommerce/product-sale-price-field",
+	"description": "A product price block with currency display.",
+	"title": "Product sale price",
+	"category": "widgets",
+	"keywords": [ "products", "price" ],
+	"textdomain": "default",
+	"attributes": {
+		"label": {
+			"type": "string",
+			"__experimentalRole": "content"
+		},
+		"help": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"align": false,
+		"html": false,
+		"multiple": false,
+		"reusable": false,
+		"inserter": false,
+		"lock": false,
+		"__experimentalToolbar": false
+	},
+	"editorStyle": "file:./editor.css"
+}
diff --git a/packages/js/product-editor/src/blocks/sale-price/edit.tsx b/packages/js/product-editor/src/blocks/sale-price/edit.tsx
new file mode 100644
index 00000000000..e96691d7e65
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/sale-price/edit.tsx
@@ -0,0 +1,102 @@
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+import { Product } from '@woocommerce/data';
+import { useBlockProps } from '@wordpress/block-editor';
+import { BlockEditProps } from '@wordpress/blocks';
+import { useInstanceId } from '@wordpress/compose';
+import { useEntityProp } from '@wordpress/core-data';
+import { createElement } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import {
+	BaseControl,
+	// @ts-expect-error `__experimentalInputControl` does exist.
+	__experimentalInputControl as InputControl,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { useValidation } from '../../contexts/validation-context';
+import { useCurrencyInputProps } from '../../hooks/use-currency-input-props';
+import { SalePriceBlockAttributes } from './types';
+
+export function Edit( {
+	attributes,
+	clientId,
+}: BlockEditProps< SalePriceBlockAttributes > ) {
+	const blockProps = useBlockProps();
+	const { label, help } = attributes;
+	const [ regularPrice ] = useEntityProp< string >(
+		'postType',
+		'product',
+		'regular_price'
+	);
+	const [ salePrice, setSalePrice ] = useEntityProp< string >(
+		'postType',
+		'product',
+		'sale_price'
+	);
+	const inputProps = useCurrencyInputProps( {
+		value: salePrice,
+		onChange: setSalePrice,
+	} );
+
+	const salePriceId = useInstanceId(
+		BaseControl,
+		'wp-block-woocommerce-product-sale-price-field'
+	) as string;
+
+	const {
+		ref: salePriceRef,
+		error: salePriceValidationError,
+		validate: validateSalePrice,
+	} = useValidation< Product >(
+		`sale-price-${ clientId }`,
+		async function salePriceValidator() {
+			if ( salePrice ) {
+				if ( Number.parseFloat( salePrice ) < 0 ) {
+					return __(
+						'Sale price must be greater than or equals to zero.',
+						'woocommerce'
+					);
+				}
+				const listPrice = Number.parseFloat( regularPrice );
+				if (
+					! listPrice ||
+					listPrice <= Number.parseFloat( salePrice )
+				) {
+					return __(
+						'Sale price must be lower than the list price.',
+						'woocommerce'
+					);
+				}
+			}
+		},
+		[ regularPrice, salePrice ]
+	);
+
+	return (
+		<div { ...blockProps }>
+			<BaseControl
+				id={ salePriceId }
+				help={
+					salePriceValidationError ? salePriceValidationError : help
+				}
+				className={ classNames( {
+					'has-error': salePriceValidationError,
+				} ) }
+			>
+				<InputControl
+					{ ...inputProps }
+					id={ salePriceId }
+					name={ 'sale_price' }
+					ref={ salePriceRef }
+					label={ label }
+					onBlur={ validateSalePrice }
+				/>
+			</BaseControl>
+		</div>
+	);
+}
diff --git a/packages/js/product-editor/src/blocks/sale-price/editor.scss b/packages/js/product-editor/src/blocks/sale-price/editor.scss
new file mode 100644
index 00000000000..5d1cf4d7d84
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/sale-price/editor.scss
@@ -0,0 +1,11 @@
+.wp-block-woocommerce-product-sale-price-field {
+	.components-currency-control {
+		.components-input-control__prefix {
+			color: $gray-700;
+		}
+
+		.components-input-control__input {
+			text-align: right;
+		}
+	}
+}
\ No newline at end of file
diff --git a/packages/js/product-editor/src/blocks/sale-price/index.ts b/packages/js/product-editor/src/blocks/sale-price/index.ts
new file mode 100644
index 00000000000..f838788b632
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/sale-price/index.ts
@@ -0,0 +1,28 @@
+/**
+ * External dependencies
+ */
+import { BlockConfiguration } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { initBlock } from '../../utils/init-blocks';
+import blockConfiguration from './block.json';
+import { Edit } from './edit';
+import { SalePriceBlockAttributes } from './types';
+
+const { name, ...metadata } =
+	blockConfiguration as BlockConfiguration< SalePriceBlockAttributes >;
+
+export { metadata, name };
+
+export const settings: Partial<
+	BlockConfiguration< SalePriceBlockAttributes >
+> = {
+	example: {},
+	edit: Edit,
+};
+
+export function init() {
+	return initBlock( { name, metadata, settings } );
+}
diff --git a/packages/js/product-editor/src/blocks/sale-price/types.ts b/packages/js/product-editor/src/blocks/sale-price/types.ts
new file mode 100644
index 00000000000..99ceaa60e80
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/sale-price/types.ts
@@ -0,0 +1,9 @@
+/**
+ * External dependencies
+ */
+import { BlockAttributes } from '@wordpress/blocks';
+
+export interface SalePriceBlockAttributes extends BlockAttributes {
+	label: string;
+	help?: string;
+}
diff --git a/packages/js/product-editor/src/blocks/schedule-sale/edit.tsx b/packages/js/product-editor/src/blocks/schedule-sale/edit.tsx
index da1686ba1d6..ee3a62ce012 100644
--- a/packages/js/product-editor/src/blocks/schedule-sale/edit.tsx
+++ b/packages/js/product-editor/src/blocks/schedule-sale/edit.tsx
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { DateTimePickerControl } from '@woocommerce/components';
+import { Product } from '@woocommerce/data';
 import { recordEvent } from '@woocommerce/tracks';
 import { useBlockProps } from '@wordpress/block-editor';
 import { BlockEditProps } from '@wordpress/blocks';
@@ -19,9 +20,11 @@ import { getSettings } from '@wordpress/date';
  * Internal dependencies
  */
 import { ScheduleSalePricingBlockAttributes } from './types';
-import { useValidation } from '../../hooks/use-validation';
+import { useValidation } from '../../contexts/validation-context';
 
-export function Edit( {}: BlockEditProps< ScheduleSalePricingBlockAttributes > ) {
+export function Edit( {
+	clientId,
+}: BlockEditProps< ScheduleSalePricingBlockAttributes > ) {
 	const blockProps = useBlockProps();
 
 	const dateTimeFormat = getSettings().formats.datetime;
@@ -84,9 +87,13 @@ export function Edit( {}: BlockEditProps< ScheduleSalePricingBlockAttributes > )
 	const _dateOnSaleFrom = moment( dateOnSaleFromGmt, moment.ISO_8601, true );
 	const _dateOnSaleTo = moment( dateOnSaleToGmt, moment.ISO_8601, true );
 
-	const dateOnSaleFromGmtValidationError = useValidation(
-		'product/date_on_sale_from_gmt',
-		function dateOnSaleFromValidator() {
+	const {
+		ref: dateOnSaleFromGmtRef,
+		error: dateOnSaleFromGmtValidationError,
+		validate: validateDateOnSaleFromGmt,
+	} = useValidation< Product >(
+		`date_on_sale_from_gmt-${ clientId }`,
+		async function dateOnSaleFromValidator() {
 			if ( showScheduleSale && dateOnSaleFromGmt ) {
 				if ( ! _dateOnSaleFrom.isValid() ) {
 					return __( 'Please enter a valid date.', 'woocommerce' );
@@ -99,12 +106,17 @@ export function Edit( {}: BlockEditProps< ScheduleSalePricingBlockAttributes > )
 					);
 				}
 			}
-		}
+		},
+		[ showScheduleSale, dateOnSaleFromGmt, _dateOnSaleFrom, _dateOnSaleTo ]
 	);
 
-	const dateOnSaleToGmtValidationError = useValidation(
-		'product/date_on_sale_to_gmt',
-		function dateOnSaleToValidator() {
+	const {
+		ref: dateOnSaleToGmtRef,
+		error: dateOnSaleToGmtValidationError,
+		validate: validateDateOnSaleToGmt,
+	} = useValidation< Product >(
+		`date_on_sale_to_gmt-${ clientId }`,
+		async function dateOnSaleToValidator() {
 			if ( showScheduleSale && dateOnSaleToGmt ) {
 				if ( ! _dateOnSaleTo.isValid() ) {
 					return __( 'Please enter a valid date.', 'woocommerce' );
@@ -117,7 +129,8 @@ export function Edit( {}: BlockEditProps< ScheduleSalePricingBlockAttributes > )
 					);
 				}
 			}
-		}
+		},
+		[ showScheduleSale, dateOnSaleFromGmt, _dateOnSaleFrom, _dateOnSaleTo ]
 	);
 
 	return (
@@ -133,6 +146,9 @@ export function Edit( {}: BlockEditProps< ScheduleSalePricingBlockAttributes > )
 				<div className="wp-block-columns">
 					<div className="wp-block-column">
 						<DateTimePickerControl
+							ref={
+								dateOnSaleFromGmtRef as React.Ref< HTMLInputElement >
+							}
 							label={ __( 'From', 'woocommerce' ) }
 							placeholder={ __(
 								'Sale start date and time (optional)',
@@ -145,11 +161,15 @@ export function Edit( {}: BlockEditProps< ScheduleSalePricingBlockAttributes > )
 								dateOnSaleFromGmtValidationError && 'has-error'
 							}
 							help={ dateOnSaleFromGmtValidationError as string }
+							onBlur={ validateDateOnSaleFromGmt }
 						/>
 					</div>
 
 					<div className="wp-block-column">
 						<DateTimePickerControl
+							ref={
+								dateOnSaleToGmtRef as React.Ref< HTMLInputElement >
+							}
 							label={ __( 'To', 'woocommerce' ) }
 							placeholder={ __(
 								'Sale end date and time (optional)',
@@ -164,6 +184,7 @@ export function Edit( {}: BlockEditProps< ScheduleSalePricingBlockAttributes > )
 										.toISOString()
 								)
 							}
+							onBlur={ validateDateOnSaleToGmt }
 							className={
 								dateOnSaleToGmtValidationError && 'has-error'
 							}
diff --git a/packages/js/product-editor/src/blocks/schedule-sale/editor.scss b/packages/js/product-editor/src/blocks/schedule-sale/editor.scss
index 8b4d06af52b..0d1cb54d151 100644
--- a/packages/js/product-editor/src/blocks/schedule-sale/editor.scss
+++ b/packages/js/product-editor/src/blocks/schedule-sale/editor.scss
@@ -1,6 +1,21 @@
 .wp-block-woocommerce-product-schedule-sale-fields {
+	margin-bottom: $gap-large;
+
+	.components-toggle-control {
+		margin-bottom: $gap;
+		padding-bottom: $gap-smaller;
+	}
+
 	.components-toggle-control__label {
 		display: flex;
 		align-items: center;
 	}
 }
+
+.wp-block-woocommerce-product-section {
+	> .block-editor-inner-blocks > .block-editor-block-list__layout {
+		> .wp-block.wp-block-woocommerce-product-schedule-sale-fields:not( :first-child ) {
+			margin-top: $gap;
+		}
+	}
+}
diff --git a/packages/js/product-editor/src/blocks/section/block.json b/packages/js/product-editor/src/blocks/section/block.json
index e915bab3cb9..0fc58c9243d 100644
--- a/packages/js/product-editor/src/blocks/section/block.json
+++ b/packages/js/product-editor/src/blocks/section/block.json
@@ -14,9 +14,6 @@
 		"description": {
 			"type": "string",
 			"__experimentalRole": "content"
-		},
-		"icon": {
-			"type": "object"
 		}
 	},
 	"supports": {
diff --git a/packages/js/product-editor/src/blocks/section/edit.tsx b/packages/js/product-editor/src/blocks/section/edit.tsx
index 5169609191b..910d6ca5cfd 100644
--- a/packages/js/product-editor/src/blocks/section/edit.tsx
+++ b/packages/js/product-editor/src/blocks/section/edit.tsx
@@ -8,13 +8,11 @@ import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
 /**
  * Internal dependencies
  */
-import { BlockIcon } from '../../components/block-icon';
 import { SectionBlockAttributes } from './types';
 import { sanitizeHTML } from '../../utils/sanitize-html';
 
 export function Edit( {
 	attributes,
-	clientId,
 }: BlockEditProps< SectionBlockAttributes > ) {
 	const blockProps = useBlockProps();
 	const { description, title } = attributes;
@@ -22,7 +20,6 @@ export function Edit( {
 	return (
 		<div { ...blockProps }>
 			<h2 className="wp-block-woocommerce-product-section__title">
-				<BlockIcon clientId={ clientId } />
 				<span>{ title }</span>
 			</h2>
 			{ description && (
diff --git a/packages/js/product-editor/src/blocks/section/editor.scss b/packages/js/product-editor/src/blocks/section/editor.scss
index 039b05a42db..51ef2351e6c 100644
--- a/packages/js/product-editor/src/blocks/section/editor.scss
+++ b/packages/js/product-editor/src/blocks/section/editor.scss
@@ -6,30 +6,21 @@
 		padding-top: 64px;
 	}
 
-    &__title {
+    .wp-block-woocommerce-product-section__title {
         margin-top: 0;
         margin-bottom: 0;
-        font-size: 24px;
+        font-size: 20px;
         font-weight: 500;
         color: $gray-900;
         display: inline-flex;
         align-items: center;
-
-        .block-editor-block-icon {
-            margin-right: 14px;
-
-            > div {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
-        }
     }
 
     &__description {
         margin-top: $gap-small;
         font-size: 13px;
-        color: $gray-900;
+        color: $gray-700;
+        line-height: 1.5;
     }
 }
 
diff --git a/packages/js/product-editor/src/blocks/shipping-fee/block.json b/packages/js/product-editor/src/blocks/shipping-class/block.json
similarity index 68%
rename from packages/js/product-editor/src/blocks/shipping-fee/block.json
rename to packages/js/product-editor/src/blocks/shipping-class/block.json
index 984cacd6165..124054818db 100644
--- a/packages/js/product-editor/src/blocks/shipping-fee/block.json
+++ b/packages/js/product-editor/src/blocks/shipping-class/block.json
@@ -1,11 +1,11 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
-	"name": "woocommerce/product-shipping-fee-fields",
-	"title": "Product shipping fee fields",
+	"name": "woocommerce/product-shipping-class-field",
+	"title": "Product shipping class field",
 	"category": "woocommerce",
-	"description": "The product shipping fee fields.",
-	"keywords": [ "products", "shipping", "fee" ],
+	"description": "The product shipping class field.",
+	"keywords": [ "products", "shipping", "class" ],
 	"textdomain": "default",
 	"attributes": {
 		"title": {
diff --git a/packages/js/product-editor/src/blocks/shipping-fee/edit.tsx b/packages/js/product-editor/src/blocks/shipping-class/edit.tsx
similarity index 55%
rename from packages/js/product-editor/src/blocks/shipping-fee/edit.tsx
rename to packages/js/product-editor/src/blocks/shipping-class/edit.tsx
index 377dce3f18b..85061e49b52 100644
--- a/packages/js/product-editor/src/blocks/shipping-fee/edit.tsx
+++ b/packages/js/product-editor/src/blocks/shipping-class/edit.tsx
@@ -18,19 +18,15 @@ import {
 	Fragment,
 	createElement,
 	createInterpolateElement,
-	useEffect,
 	useState,
 } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import classNames from 'classnames';
 import { useEntityProp } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
-import { ShippingFeeBlockAttributes } from './types';
-import { useValidation } from '../../hooks/use-validation';
-import { RadioField } from '../../components/radio-field';
+import { ShippingClassBlockAttributes } from './types';
 import { AddNewShippingClassModal } from '../../components';
 import { ADD_NEW_SHIPPING_CLASS_OPTION_VALUE } from '../../constants';
 
@@ -38,9 +34,6 @@ type ServerErrorResponse = {
 	code: string;
 };
 
-const FOLLOW_CLASS_OPTION_VALUE = 'follow_class';
-const FREE_SHIPPING_OPTION_VALUE = 'free_shipping';
-
 export const DEFAULT_SHIPPING_CLASS_OPTIONS: SelectControl.Option[] = [
 	{ value: '', label: __( 'No shipping class', 'woocommerce' ) },
 	{
@@ -58,17 +51,6 @@ function mapShippingClassToSelectOption(
 	} ) );
 }
 
-const options = [
-	{
-		label: __( 'Follow class', 'woocommerce' ),
-		value: FOLLOW_CLASS_OPTION_VALUE,
-	},
-	{
-		label: __( 'Free shipping', 'woocommerce' ),
-		value: FREE_SHIPPING_OPTION_VALUE,
-	},
-];
-
 function extractDefaultShippingClassFromProduct(
 	categories?: PartialProduct[ 'categories' ],
 	shippingClasses?: ProductShippingClass[]
@@ -87,19 +69,12 @@ function extractDefaultShippingClassFromProduct(
 	}
 }
 
-export function Edit( {
-	attributes,
-}: BlockEditProps< ShippingFeeBlockAttributes > ) {
-	const { title } = attributes;
+export function Edit( {}: BlockEditProps< ShippingClassBlockAttributes > ) {
 	const [ showShippingClassModal, setShowShippingClassModal ] =
 		useState( false );
 
 	const blockProps = useBlockProps();
 
-	const [ option, setOption ] = useState< string >(
-		FREE_SHIPPING_OPTION_VALUE
-	);
-
 	const { createProductShippingClass, invalidateResolution } = useDispatch(
 		EXPERIMENTAL_PRODUCT_SHIPPING_CLASSES_STORE_NAME
 	);
@@ -149,114 +124,71 @@ export function Edit( {
 		};
 	}, [] );
 
-	const shippingClassControlId = useInstanceId( BaseControl ) as string;
-
-	const shippingClassValidationError = useValidation(
-		'product/shipping_class',
-		function shippingClassValidator() {
-			if ( option === FOLLOW_CLASS_OPTION_VALUE && ! shippingClass ) {
-				return __( 'The shipping class is required.', 'woocommerce' );
-			}
-		}
-	);
-
-	function handleOptionChange( value: string ) {
-		setOption( value );
-
-		if ( value === FOLLOW_CLASS_OPTION_VALUE ) {
-			const [ firstShippingClass ] = shippingClasses;
-			setShippingClass( firstShippingClass?.slug ?? '' );
-		} else {
-			setShippingClass( '' );
-		}
-	}
-
-	useEffect( () => {
-		if ( shippingClass ) {
-			setOption( FOLLOW_CLASS_OPTION_VALUE );
-		}
-	}, [ shippingClass ] );
+	const shippingClassControlId = useInstanceId(
+		BaseControl,
+		'wp-block-woocommerce-product-shipping-class-field'
+	) as string;
 
 	return (
 		<div { ...blockProps }>
 			<div className="wp-block-columns">
 				<div className="wp-block-column">
-					<RadioField
-						title={ title }
-						selected={ option }
-						options={ options }
-						onChange={ handleOptionChange }
+					<SelectControl
+						id={ shippingClassControlId }
+						name="shipping_class"
+						value={ shippingClass }
+						onChange={ ( value: string ) => {
+							if (
+								value === ADD_NEW_SHIPPING_CLASS_OPTION_VALUE
+							) {
+								setShowShippingClassModal( true );
+								return;
+							}
+							setShippingClass( value );
+						} }
+						label={ __( 'Shipping class', 'woocommerce' ) }
+						options={ [
+							...DEFAULT_SHIPPING_CLASS_OPTIONS,
+							...mapShippingClassToSelectOption(
+								shippingClasses ?? []
+							),
+						] }
+						help={ createInterpolateElement(
+							__(
+								'Manage shipping classes and rates in <Link>global settings</Link>.',
+								'woocommerce'
+							),
+							{
+								Link: (
+									<Link
+										href={ getNewPath(
+											{
+												tab: 'shipping',
+												section: 'classes',
+											},
+											'',
+											{},
+											'wc-settings'
+										) }
+										target="_blank"
+										type="external"
+										onClick={ () => {
+											recordEvent(
+												'product_shipping_global_settings_link_click'
+											);
+										} }
+									>
+										<Fragment />
+									</Link>
+								),
+							}
+						) }
 					/>
 				</div>
+
+				<div className="wp-block-column"></div>
 			</div>
 
-			{ option === FOLLOW_CLASS_OPTION_VALUE && (
-				<div className="wp-block-columns">
-					<div
-						className={ classNames( 'wp-block-column', {
-							'has-error': shippingClassValidationError,
-						} ) }
-					>
-						<SelectControl
-							id={ shippingClassControlId }
-							name="shipping_class"
-							value={ shippingClass }
-							onChange={ ( value: string ) => {
-								if (
-									value ===
-									ADD_NEW_SHIPPING_CLASS_OPTION_VALUE
-								) {
-									setShowShippingClassModal( true );
-									return;
-								}
-								setShippingClass( value );
-							} }
-							label={ __( 'Shipping class', 'woocommerce' ) }
-							options={ [
-								...DEFAULT_SHIPPING_CLASS_OPTIONS,
-								...mapShippingClassToSelectOption(
-									shippingClasses ?? []
-								),
-							] }
-							help={
-								shippingClassValidationError ||
-								createInterpolateElement(
-									__(
-										'Manage shipping classes and rates in <Link>global settings</Link>.',
-										'woocommerce'
-									),
-									{
-										Link: (
-											<Link
-												href={ getNewPath(
-													{
-														tab: 'shipping',
-														section: 'classes',
-													},
-													'',
-													{},
-													'wc-settings'
-												) }
-												target="_blank"
-												type="external"
-												onClick={ () => {
-													recordEvent(
-														'product_shipping_global_settings_link_click'
-													);
-												} }
-											>
-												<Fragment />
-											</Link>
-										),
-									}
-								)
-							}
-						/>
-					</div>
-
-					<div className="wp-block-column"></div>
-				</div>
-			) }
 			{ showShippingClassModal && (
 				<AddNewShippingClassModal
 					shippingClass={ extractDefaultShippingClassFromProduct(
diff --git a/packages/js/product-editor/src/blocks/shipping-fee/index.ts b/packages/js/product-editor/src/blocks/shipping-class/index.ts
similarity index 73%
rename from packages/js/product-editor/src/blocks/shipping-fee/index.ts
rename to packages/js/product-editor/src/blocks/shipping-class/index.ts
index a40803eedfd..2f0d4ef3046 100644
--- a/packages/js/product-editor/src/blocks/shipping-fee/index.ts
+++ b/packages/js/product-editor/src/blocks/shipping-class/index.ts
@@ -10,15 +10,15 @@ import { BlockConfiguration } from '@wordpress/blocks';
 import { initBlock } from '../../utils/init-blocks';
 import blockConfiguration from './block.json';
 import { Edit } from './edit';
-import { ShippingFeeBlockAttributes } from './types';
+import { ShippingClassBlockAttributes } from './types';
 
 const { name, ...metadata } =
-	blockConfiguration as BlockConfiguration< ShippingFeeBlockAttributes >;
+	blockConfiguration as BlockConfiguration< ShippingClassBlockAttributes >;
 
 export { metadata, name };
 
 export const settings: Partial<
-	BlockConfiguration< ShippingFeeBlockAttributes >
+	BlockConfiguration< ShippingClassBlockAttributes >
 > = {
 	example: {},
 	edit: Edit,
diff --git a/packages/js/product-editor/src/blocks/shipping-fee/types.ts b/packages/js/product-editor/src/blocks/shipping-class/types.ts
similarity index 59%
rename from packages/js/product-editor/src/blocks/shipping-fee/types.ts
rename to packages/js/product-editor/src/blocks/shipping-class/types.ts
index 90877619db6..4e2daa9c8fc 100644
--- a/packages/js/product-editor/src/blocks/shipping-fee/types.ts
+++ b/packages/js/product-editor/src/blocks/shipping-class/types.ts
@@ -3,6 +3,6 @@
  */
 import { BlockAttributes } from '@wordpress/blocks';
 
-export interface ShippingFeeBlockAttributes extends BlockAttributes {
+export interface ShippingClassBlockAttributes extends BlockAttributes {
 	title: string;
 }
diff --git a/packages/js/product-editor/src/blocks/shipping-dimensions/edit.tsx b/packages/js/product-editor/src/blocks/shipping-dimensions/edit.tsx
index c162f637a74..16a82d972de 100644
--- a/packages/js/product-editor/src/blocks/shipping-dimensions/edit.tsx
+++ b/packages/js/product-editor/src/blocks/shipping-dimensions/edit.tsx
@@ -3,7 +3,11 @@
  */
 import { useBlockProps } from '@wordpress/block-editor';
 import { BlockEditProps } from '@wordpress/blocks';
-import { OPTIONS_STORE_NAME, ProductDimensions } from '@woocommerce/data';
+import {
+	OPTIONS_STORE_NAME,
+	Product,
+	ProductDimensions,
+} from '@woocommerce/data';
 import { useInstanceId } from '@wordpress/compose';
 import { useEntityProp } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
@@ -29,9 +33,11 @@ import {
 	HighlightSides,
 	ShippingDimensionsImage,
 } from '../../components/shipping-dimensions-image';
-import { useValidation } from '../../hooks/use-validation';
+import { useValidation } from '../../contexts/validation-context';
 
-export function Edit( {}: BlockEditProps< ShippingDimensionsBlockAttributes > ) {
+export function Edit( {
+	clientId,
+}: BlockEditProps< ShippingDimensionsBlockAttributes > ) {
 	const blockProps = useBlockProps();
 
 	const [ dimensions, setDimensions ] =
@@ -79,12 +85,70 @@ export function Edit( {}: BlockEditProps< ShippingDimensionsBlockAttributes > )
 		};
 	}
 
+	const {
+		ref: dimensionsWidthRef,
+		error: dimensionsWidthValidationError,
+		validate: validateDimensionsWidth,
+	} = useValidation< Product >(
+		`dimensions_width-${ clientId }`,
+		async function dimensionsWidthValidator() {
+			if ( dimensions?.width && +dimensions.width <= 0 ) {
+				return __( 'Width must be greater than zero.', 'woocommerce' );
+			}
+		},
+		[ dimensions?.width ]
+	);
+
+	const {
+		ref: dimensionsLengthRef,
+		error: dimensionsLengthValidationError,
+		validate: validateDimensionsLength,
+	} = useValidation< Product >(
+		`dimensions_length-${ clientId }`,
+		async function dimensionsLengthValidator() {
+			if ( dimensions?.length && +dimensions.length <= 0 ) {
+				return __( 'Length must be greater than zero.', 'woocommerce' );
+			}
+		},
+		[ dimensions?.length ]
+	);
+
+	const {
+		ref: dimensionsHeightRef,
+		error: dimensionsHeightValidationError,
+		validate: validateDimensionsHeight,
+	} = useValidation< Product >(
+		`dimensions_height-${ clientId }`,
+		async function dimensionsHeightValidator() {
+			if ( dimensions?.height && +dimensions.height <= 0 ) {
+				return __( 'Height must be greater than zero.', 'woocommerce' );
+			}
+		},
+		[ dimensions?.height ]
+	);
+
+	const {
+		ref: weightRef,
+		error: weightValidationError,
+		validate: validateWeight,
+	} = useValidation< Product >(
+		`weight-${ clientId }`,
+		async function weightValidator() {
+			if ( weight && +weight <= 0 ) {
+				return __( 'Weight must be greater than zero.', 'woocommerce' );
+			}
+		},
+		[ weight ]
+	);
+
 	const dimensionsWidthProps = {
 		...getDimensionsControlProps( 'width', 'A' ),
 		id: useInstanceId(
 			BaseControl,
 			`product_shipping_dimensions_width`
 		) as string,
+		ref: dimensionsWidthRef,
+		onBlur: validateDimensionsWidth,
 	};
 	const dimensionsLengthProps = {
 		...getDimensionsControlProps( 'length', 'B' ),
@@ -92,6 +156,8 @@ export function Edit( {}: BlockEditProps< ShippingDimensionsBlockAttributes > )
 			BaseControl,
 			`product_shipping_dimensions_length`
 		) as string,
+		ref: dimensionsLengthRef,
+		onBlur: validateDimensionsLength,
 	};
 	const dimensionsHeightProps = {
 		...getDimensionsControlProps( 'height', 'C' ),
@@ -99,6 +165,8 @@ export function Edit( {}: BlockEditProps< ShippingDimensionsBlockAttributes > )
 			BaseControl,
 			`product_shipping_dimensions_height`
 		) as string,
+		ref: dimensionsHeightRef,
+		onBlur: validateDimensionsHeight,
 	};
 	const weightProps = {
 		id: useInstanceId( BaseControl, `product_shipping_weight` ) as string,
@@ -106,41 +174,10 @@ export function Edit( {}: BlockEditProps< ShippingDimensionsBlockAttributes > )
 		value: formatNumber( String( weight ) ),
 		onChange: ( value: string ) => setWeight( parseNumber( value ) ),
 		suffix: weightUnit,
+		ref: weightRef,
+		onBlur: validateWeight,
 	};
 
-	const dimensionsWidthValidationError = useValidation(
-		'product/dimensions/width',
-		function dimensionsWidthValidator() {
-			if ( dimensions?.width && +dimensions.width <= 0 ) {
-				return __( 'Width must be greater than zero.', 'woocommerce' );
-			}
-		}
-	);
-	const dimensionsLengthValidationError = useValidation(
-		'product/dimensions/length',
-		function dimensionsLengthValidator() {
-			if ( dimensions?.length && +dimensions.length <= 0 ) {
-				return __( 'Length must be greater than zero.', 'woocommerce' );
-			}
-		}
-	);
-	const dimensionsHeightValidationError = useValidation(
-		'product/dimensions/height',
-		function dimensionsHeightValidator() {
-			if ( dimensions?.height && +dimensions.height <= 0 ) {
-				return __( 'Height must be greater than zero.', 'woocommerce' );
-			}
-		}
-	);
-	const weightValidationError = useValidation(
-		'product/weight',
-		function weightValidator() {
-			if ( weight && +weight <= 0 ) {
-				return __( 'Weight must be greater than zero.', 'woocommerce' );
-			}
-		}
-	);
-
 	return (
 		<div { ...blockProps }>
 			<h4>{ __( 'Dimensions', 'woocommerce' ) }</h4>
@@ -205,6 +242,17 @@ export function Edit( {}: BlockEditProps< ShippingDimensionsBlockAttributes > )
 					<ShippingDimensionsImage
 						highlight={ highlightSide }
 						className="wp-block-woocommerce-product-shipping-dimensions-fields__dimensions-image"
+						labels={ {
+							A: dimensionsWidthProps.value?.length
+								? dimensionsWidthProps.value
+								: undefined,
+							B: dimensionsLengthProps.value?.length
+								? dimensionsLengthProps.value
+								: undefined,
+							C: dimensionsHeightProps.value?.length
+								? dimensionsHeightProps.value
+								: undefined,
+						} }
 					/>
 				</div>
 			</div>
diff --git a/packages/js/product-editor/src/blocks/shipping-dimensions/editor.scss b/packages/js/product-editor/src/blocks/shipping-dimensions/editor.scss
index 38bd27dc95e..668f03a6f9e 100644
--- a/packages/js/product-editor/src/blocks/shipping-dimensions/editor.scss
+++ b/packages/js/product-editor/src/blocks/shipping-dimensions/editor.scss
@@ -18,5 +18,6 @@
 		width: 100%;
 		height: 100%;
 		padding: $gap;
+		overflow: visible;
 	}
 }
diff --git a/packages/js/product-editor/src/blocks/style.scss b/packages/js/product-editor/src/blocks/style.scss
index ea81340017d..87bb061a386 100644
--- a/packages/js/product-editor/src/blocks/style.scss
+++ b/packages/js/product-editor/src/blocks/style.scss
@@ -1,3 +1,4 @@
+@import 'attributes/editor.scss';
 @import 'category/editor.scss';
 @import 'checkbox/editor.scss';
 @import 'images/editor.scss';
@@ -5,6 +6,8 @@
 @import 'inventory-sku/editor.scss';
 @import 'name/editor.scss';
 @import 'pricing/editor.scss';
+@import 'regular-price/editor.scss';
+@import 'sale-price/editor.scss';
 @import 'schedule-sale/editor.scss';
 @import 'section/editor.scss';
 @import 'shipping-dimensions/editor.scss';
diff --git a/packages/js/product-editor/src/blocks/summary/edit.tsx b/packages/js/product-editor/src/blocks/summary/edit.tsx
index f9d07c81c45..802a9898d47 100644
--- a/packages/js/product-editor/src/blocks/summary/edit.tsx
+++ b/packages/js/product-editor/src/blocks/summary/edit.tsx
@@ -5,8 +5,9 @@ import { __ } from '@wordpress/i18n';
 import { createElement } from '@wordpress/element';
 import { BlockEditProps } from '@wordpress/blocks';
 import { BaseControl } from '@wordpress/components';
+import { useDispatch } from '@wordpress/data';
 import { useEntityProp } from '@wordpress/core-data';
-import uniqueId from 'lodash/uniqueId';
+import { useInstanceId } from '@wordpress/compose';
 import classNames from 'classnames';
 import {
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -14,6 +15,7 @@ import {
 	AlignmentControl,
 	BlockControls,
 	RichText,
+	store as blockEditorStore,
 	useBlockProps,
 } from '@wordpress/block-editor';
 
@@ -32,12 +34,18 @@ export function Edit( {
 	const blockProps = useBlockProps( {
 		style: { direction },
 	} );
-	const id = uniqueId();
+	const contentId = useInstanceId(
+		Edit,
+		'wp-block-woocommerce-product-summary-field__content'
+	);
 	const [ summary, setSummary ] = useEntityProp< string >(
 		'postType',
 		'product',
 		'short_description'
 	);
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore No types for this exist yet.
+	const { clearSelectedBlock } = useDispatch( blockEditorStore );
 
 	function handleAlignmentChange( value: SummaryAttributes[ 'align' ] ) {
 		setAttributes( { align: value } );
@@ -47,8 +55,21 @@ export function Edit( {
 		setAttributes( { direction: value } );
 	}
 
+	function handleBlur( event: React.FocusEvent< 'p', Element > ) {
+		const isToolbar = event.relatedTarget?.closest(
+			'.block-editor-block-contextual-toolbar'
+		);
+		if ( ! isToolbar ) {
+			clearSelectedBlock();
+		}
+	}
+
 	return (
-		<div { ...blockProps }>
+		<div
+			className={
+				'wp-block wp-block-woocommerce-product-summary-field-wrapper'
+			}
+		>
 			{ /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ }
 			{ /* @ts-ignore No types for this exist yet. */ }
 			<BlockControls group="block">
@@ -65,26 +86,29 @@ export function Edit( {
 			</BlockControls>
 
 			<BaseControl
-				id={ id }
+				id={ contentId.toString() }
 				label={ label || __( 'Summary', 'woocommerce' ) }
 			>
-				<RichText
-					id={ id }
-					identifier="content"
-					tagName="p"
-					value={ summary }
-					onChange={ setSummary }
-					placeholder={ __(
-						"Summarize this product in 1-2 short sentences. We'll show it at the top of the page.",
-						'woocommerce'
-					) }
-					data-empty={ Boolean( summary ) }
-					className={ classNames( 'components-summary-control', {
-						[ `has-text-align-${ align }` ]: align,
-					} ) }
-					dir={ direction }
-					allowedFormats={ allowedFormats }
-				/>
+				<div { ...blockProps }>
+					<RichText
+						id={ contentId.toString() }
+						identifier="content"
+						tagName="p"
+						value={ summary }
+						onChange={ setSummary }
+						placeholder={ __(
+							"Summarize this product in 1-2 short sentences. We'll show it at the top of the page.",
+							'woocommerce'
+						) }
+						data-empty={ Boolean( summary ) }
+						className={ classNames( 'components-summary-control', {
+							[ `has-text-align-${ align }` ]: align,
+						} ) }
+						dir={ direction }
+						allowedFormats={ allowedFormats }
+						onBlur={ handleBlur }
+					/>
+				</div>
 			</BaseControl>
 		</div>
 	);
diff --git a/packages/js/product-editor/src/blocks/summary/editor.scss b/packages/js/product-editor/src/blocks/summary/editor.scss
index cca4b4b19b3..a984c0fe6d1 100644
--- a/packages/js/product-editor/src/blocks/summary/editor.scss
+++ b/packages/js/product-editor/src/blocks/summary/editor.scss
@@ -1,3 +1,10 @@
+.wp-block-woocommerce-product-summary-field-wrapper {
+	& .wp-block-woocommerce-product-summary-field {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+}
+
 .components-summary-control {
 	width: 100%;
 	min-height: calc($gap-larger * 3);
diff --git a/packages/js/product-editor/src/components/attribute-control/attribute-field.scss b/packages/js/product-editor/src/components/attribute-control/attribute-field.scss
index cfd62fa466d..9e5244c5cb2 100644
--- a/packages/js/product-editor/src/components/attribute-control/attribute-field.scss
+++ b/packages/js/product-editor/src/components/attribute-control/attribute-field.scss
@@ -19,17 +19,3 @@
 	}
 
 }
-
-.wp-block-woocommerce-product-attributes-field {
-
-	.woocommerce-sortable {
-		padding: 0;
-	}
-
-	.woocommerce-list-item {
-		background: none;
-		border: none;
-		border-bottom: 1px solid $gray-200;
-		padding-left: 0;
-	}
-}
diff --git a/packages/js/product-editor/src/components/block-editor/block-editor.tsx b/packages/js/product-editor/src/components/block-editor/block-editor.tsx
index 2c011c4ed7a..de33904ec3a 100644
--- a/packages/js/product-editor/src/components/block-editor/block-editor.tsx
+++ b/packages/js/product-editor/src/components/block-editor/block-editor.tsx
@@ -18,8 +18,10 @@ import {
 	BlockTools,
 	EditorSettings,
 	EditorBlockListSettings,
-	WritingFlow,
 	ObserveTyping,
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore No types for this exist yet.
+	__unstableEditorStyles as EditorStyles,
 } from '@wordpress/block-editor';
 // It doesn't seem to notice the External dependency block whn @ts-ignore is added.
 // eslint-disable-next-line @woocommerce/dependency-group
@@ -101,16 +103,15 @@ export function BlockEditor( {
 					onChange={ onChange }
 					settings={ settings }
 				>
+					<EditorStyles styles={ settings?.styles } />
 					<div className="editor-styles-wrapper">
 						{ /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ }
 						{ /* @ts-ignore No types for this exist yet. */ }
 						<BlockEditorKeyboardShortcuts.Register />
 						<BlockTools>
-							<WritingFlow>
-								<ObserveTyping>
-									<BlockList className="woocommerce-product-block-editor__block-list" />
-								</ObserveTyping>
-							</WritingFlow>
+							<ObserveTyping>
+								<BlockList className="woocommerce-product-block-editor__block-list" />
+							</ObserveTyping>
 						</BlockTools>
 					</div>
 				</BlockEditorProvider>
diff --git a/packages/js/product-editor/src/components/block-editor/style.scss b/packages/js/product-editor/src/components/block-editor/style.scss
index 1aa58956bef..538eacaea7b 100644
--- a/packages/js/product-editor/src/components/block-editor/style.scss
+++ b/packages/js/product-editor/src/components/block-editor/style.scss
@@ -41,6 +41,10 @@
 		margin-left: auto;
 		margin-right: auto;
 		padding-bottom: 128px;
+
+		h4 {
+			font-size: 16px;
+		}
 	}
 
 	.components-input-control {
@@ -75,6 +79,7 @@
 
 	.wp-block-columns {
 		gap: $gap-large;
+		margin-bottom: 0;
 	}
 
 	.wp-block-woocommerce-product-section {
@@ -100,9 +105,3 @@
 		display: none; // use important or increase specificity.
 	}
 }
-
-.woocommerce-layout:has( .woocommerce-product-block-editor ) {
-	.woocommerce-layout__header {
-		display: none;
-	}
-}
diff --git a/packages/js/product-editor/src/components/details-categories-field/category-field.tsx b/packages/js/product-editor/src/components/details-categories-field/category-field.tsx
index f9160e19180..67477a53501 100644
--- a/packages/js/product-editor/src/components/details-categories-field/category-field.tsx
+++ b/packages/js/product-editor/src/components/details-categories-field/category-field.tsx
@@ -55,31 +55,41 @@ function getSelectedWithParents(
 	return selected;
 }
 
-function mapFromCategoryType(
-	categories: ProductCategoryNode[]
-): TreeItemType[] {
-	return categories.map( ( val ) =>
-		val.parent
-			? {
-					value: String( val.id ),
-					label: val.name,
-					parent: String( val.parent ),
-			  }
-			: {
-					value: String( val.id ),
-					label: val.name,
-			  }
-	);
+export function mapFromCategoryToTreeItem(
+	val: ProductCategoryNode
+): TreeItemType {
+	return val.parent
+		? {
+				value: String( val.id ),
+				label: val.name,
+				parent: String( val.parent ),
+		  }
+		: {
+				value: String( val.id ),
+				label: val.name,
+		  };
 }
 
-function mapToCategoryType(
+export function mapFromTreeItemToCategory(
+	val: TreeItemType
+): ProductCategoryNode {
+	return {
+		id: +val.value,
+		name: val.label,
+		parent: val.parent ? +val.parent : 0,
+	};
+}
+
+export function mapFromCategoriesToTreeItems(
+	categories: ProductCategoryNode[]
+): TreeItemType[] {
+	return categories.map( mapFromCategoryToTreeItem );
+}
+
+export function mapFromTreeItemsToCategories(
 	categories: TreeItemType[]
 ): ProductCategoryNode[] {
-	return categories.map( ( cat ) => ( {
-		id: +cat.value,
-		name: cat.label,
-		parent: cat.parent ? +cat.parent : 0,
-	} ) );
+	return categories.map( mapFromTreeItemToCategory );
 }
 
 export const CategoryField: React.FC< CategoryFieldProps > = ( {
@@ -129,15 +139,15 @@ export const CategoryField: React.FC< CategoryFieldProps > = ( {
 					) === -1
 				}
 				items={ getFilteredItemsForSelectTree(
-					mapFromCategoryType( categoriesSelectList ),
+					mapFromCategoriesToTreeItems( categoriesSelectList ),
 					searchValue,
-					mapFromCategoryType( value )
+					mapFromCategoriesToTreeItems( value )
 				) }
-				selected={ mapFromCategoryType( value ) }
+				selected={ mapFromCategoriesToTreeItems( value ) }
 				onSelect={ ( selectedItems ) => {
 					if ( Array.isArray( selectedItems ) ) {
 						const newItems: ProductCategoryNode[] =
-							mapToCategoryType(
+							mapFromTreeItemsToCategories(
 								selectedItems.filter(
 									( { value: selectedItemValue } ) =>
 										! value.some(
diff --git a/packages/js/product-editor/src/components/details-categories-field/create-category-modal.scss b/packages/js/product-editor/src/components/details-categories-field/create-category-modal.scss
index 4c8ead0e0da..d9e63aa1052 100644
--- a/packages/js/product-editor/src/components/details-categories-field/create-category-modal.scss
+++ b/packages/js/product-editor/src/components/details-categories-field/create-category-modal.scss
@@ -1,5 +1,6 @@
 .woocommerce-create-new-category-modal {
 	min-width: 650px;
+	overflow: visible;
 
 	&__buttons {
 		margin-top: $gap-larger;
diff --git a/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx b/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx
index eefec178245..f1020c7cc6a 100644
--- a/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx
+++ b/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Button, Modal, Spinner, TextControl } from '@wordpress/components';
+import { Button, Modal, TextControl } from '@wordpress/components';
 import { useDebounce } from '@wordpress/compose';
 import {
 	useState,
@@ -11,8 +11,8 @@ import {
 } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
 import {
-	__experimentalSelectControl as SelectControl,
-	__experimentalSelectControlMenu as Menu,
+	__experimentalSelectTreeControl as SelectTree,
+	TreeItemType as Item,
 } from '@woocommerce/components';
 import { recordEvent } from '@woocommerce/tracks';
 import {
@@ -24,7 +24,10 @@ import {
  * Internal dependencies
  */
 import { ProductCategoryNode, useCategorySearch } from './use-category-search';
-import { CategoryFieldItem } from './category-field-item';
+import {
+	mapFromCategoriesToTreeItems,
+	mapFromCategoryToTreeItem,
+} from './category-field';
 
 type CreateCategoryModalProps = {
 	initialCategoryName?: string;
@@ -32,15 +35,6 @@ type CreateCategoryModalProps = {
 	onCreate: ( newCategory: ProductCategory ) => void;
 };
 
-function getCategoryItemLabel( item: ProductCategoryNode | null ): string {
-	return item?.name || '';
-}
-function getCategoryItemValue(
-	item: ProductCategoryNode | null
-): string | number {
-	return item?.id || '';
-}
-
 export const CreateCategoryModal: React.FC< CreateCategoryModalProps > = ( {
 	initialCategoryName,
 	onCancel,
@@ -49,9 +43,8 @@ export const CreateCategoryModal: React.FC< CreateCategoryModalProps > = ( {
 	const {
 		categoriesSelectList,
 		isSearching,
-		categoryTreeKeyValues,
 		searchCategories,
-		getFilteredItems,
+		getFilteredItemsForSelectTree,
 	} = useCategorySearch();
 	const { createNotice } = useDispatch( 'core/notices' );
 	const [ isCreating, setIsCreating ] = useState( false );
@@ -63,6 +56,9 @@ export const CreateCategoryModal: React.FC< CreateCategoryModalProps > = ( {
 	const [ categoryParent, setCategoryParent ] =
 		useState< ProductCategoryNode | null >( null );
 
+	const [ categoryParentTypedValue, setCategoryParentTypedValue ] =
+		useState( '' );
+
 	const onSave = async () => {
 		recordEvent( 'product_category_add', {
 			new_product_page: true,
@@ -101,8 +97,7 @@ export const CreateCategoryModal: React.FC< CreateCategoryModalProps > = ( {
 					value={ categoryName }
 					onChange={ setCategoryName }
 				/>
-				<SelectControl< ProductCategoryNode >
-					items={ categoriesSelectList }
+				<SelectTree
 					label={ createInterpolateElement(
 						__( 'Parent category <optional/>', 'woocommerce' ),
 						{
@@ -113,78 +108,34 @@ export const CreateCategoryModal: React.FC< CreateCategoryModalProps > = ( {
 							),
 						}
 					) }
-					selected={ categoryParent }
-					onSelect={ ( item ) => item && setCategoryParent( item ) }
+					id="parent-category-field"
+					isLoading={ isSearching }
+					items={ getFilteredItemsForSelectTree(
+						mapFromCategoriesToTreeItems( categoriesSelectList ),
+						categoryParentTypedValue,
+						[]
+					) }
+					shouldNotRecursivelySelect
+					selected={
+						categoryParent
+							? mapFromCategoryToTreeItem( categoryParent )
+							: undefined
+					}
+					onSelect={ ( item: Item ) =>
+						item &&
+						setCategoryParent( {
+							id: +item.value,
+							name: item.label,
+							parent: item.parent ? +item.parent : 0,
+						} )
+					}
 					onRemove={ () => setCategoryParent( null ) }
-					onInputChange={ debouncedSearch }
-					getFilteredItems={ getFilteredItems }
-					getItemLabel={ getCategoryItemLabel }
-					getItemValue={ getCategoryItemValue }
-				>
-					{ ( {
-						items,
-						isOpen,
-						getMenuProps,
-						highlightedIndex,
-						getItemProps,
-					} ) => {
-						return (
-							<Menu
-								isOpen={ isOpen }
-								getMenuProps={ getMenuProps }
-								className="woocommerce-category-field-dropdown__menu"
-							>
-								{ [
-									isSearching ? (
-										<div
-											key="loading-spinner"
-											className="woocommerce-category-field-dropdown__item"
-										>
-											<div className="woocommerce-category-field-dropdown__item-content">
-												<Spinner />
-											</div>
-										</div>
-									) : null,
-									...items
-										.filter(
-											( item ) =>
-												categoryTreeKeyValues[ item.id ]
-													?.parentID === 0
-										)
-										.map( ( item ) => {
-											return (
-												<CategoryFieldItem
-													key={ `${ item.id }` }
-													item={
-														categoryTreeKeyValues[
-															item.id
-														]
-													}
-													selectedIds={
-														categoryParent
-															? [
-																	categoryParent.id,
-															  ]
-															: []
-													}
-													items={ items }
-													highlightedIndex={
-														highlightedIndex
-													}
-													getItemProps={
-														getItemProps
-													}
-												/>
-											);
-										} ),
-								].filter(
-									( item ): item is JSX.Element =>
-										item !== null
-								) }
-							</Menu>
-						);
+					onInputChange={ ( value ) => {
+						debouncedSearch( value );
+						setCategoryParentTypedValue( value || '' );
 					} }
-				</SelectControl>
+					createValue={ categoryParentTypedValue }
+				/>
 				<div className="woocommerce-create-new-category-modal__buttons">
 					<Button
 						isSecondary
diff --git a/packages/js/product-editor/src/components/details-categories-field/test/category-field.test.tsx b/packages/js/product-editor/src/components/details-categories-field/test/category-field.test.tsx
index d0616672c2e..8f5b6a416e2 100644
--- a/packages/js/product-editor/src/components/details-categories-field/test/category-field.test.tsx
+++ b/packages/js/product-editor/src/components/details-categories-field/test/category-field.test.tsx
@@ -74,7 +74,6 @@ describe( 'CategoryField', () => {
 			</Form>
 		);
 		queryByPlaceholderText( 'Search or create category…' )?.focus();
-		expect( queryAllByText( 'Test' ) ).toHaveLength( 2 );
-		expect( queryAllByText( 'Clothing' ) ).toHaveLength( 2 );
+		expect( queryAllByText( 'Test, Clothing' ) ).toHaveLength( 1 );
 	} );
 } );
diff --git a/packages/js/product-editor/src/components/details-categories-field/test/use-category-search.test.ts b/packages/js/product-editor/src/components/details-categories-field/test/use-category-search.test.ts
index 040f3810344..fd20cc1b67c 100644
--- a/packages/js/product-editor/src/components/details-categories-field/test/use-category-search.test.ts
+++ b/packages/js/product-editor/src/components/details-categories-field/test/use-category-search.test.ts
@@ -8,6 +8,7 @@ import { useSelect, resolveSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import { useCategorySearch } from '../use-category-search';
+import { mapFromCategoriesToTreeItems } from '../../details-categories-field/category-field';
 
 jest.mock( '@wordpress/data', () => ( {
 	...jest.requireActual( '@wordpress/data' ),
@@ -179,7 +180,7 @@ describe( 'useCategorySearch', () => {
 		);
 	} );
 
-	describe( 'getFilteredItems', () => {
+	describe( 'getFilteredItemsForSelectTree', () => {
 		it( 'should filter items by label, matching input value, and if selected', async () => {
 			getProductCategoriesMock.mockReturnValue( [ ...mockCategoryList ] );
 
@@ -191,13 +192,15 @@ describe( 'useCategorySearch', () => {
 			);
 			await waitForNextUpdate();
 
-			const filteredItems = result.current.getFilteredItems(
-				result.current.categoriesSelectList,
+			const filteredItems = result.current.getFilteredItemsForSelectTree(
+				mapFromCategoriesToTreeItems(
+					result.current.categoriesSelectList
+				),
 				'Rain',
 				[]
 			);
 			expect( filteredItems.length ).toEqual( 1 );
-			expect( filteredItems[ 0 ].name ).toEqual( 'Rain gear' );
+			expect( filteredItems[ 0 ].label ).toEqual( 'Rain gear' );
 		} );
 
 		it( 'should filter items by isOpen as well, keeping them if isOpen is true', async () => {
@@ -215,15 +218,17 @@ describe( 'useCategorySearch', () => {
 			} );
 			await waitForNextUpdate();
 			expect( result.current.categoriesSelectList.length ).toEqual( 6 );
-			const filteredItems = result.current.getFilteredItems(
-				result.current.categoriesSelectList,
+			const filteredItems = result.current.getFilteredItemsForSelectTree(
+				mapFromCategoriesToTreeItems(
+					result.current.categoriesSelectList
+				),
 				'Bel',
 				[]
 			);
 			expect( filteredItems.length ).toEqual( 3 );
-			expect( filteredItems[ 0 ].name ).toEqual( 'Clothing' );
-			expect( filteredItems[ 1 ].name ).toEqual( 'Accessories' );
-			expect( filteredItems[ 2 ].name ).toEqual( 'Belts' );
+			expect( filteredItems[ 0 ].label ).toEqual( 'Clothing' );
+			expect( filteredItems[ 1 ].label ).toEqual( 'Accessories' );
+			expect( filteredItems[ 2 ].label ).toEqual( 'Belts' );
 		} );
 	} );
 
diff --git a/packages/js/product-editor/src/components/details-categories-field/use-category-search.ts b/packages/js/product-editor/src/components/details-categories-field/use-category-search.ts
index cfd5b14a774..974ac54c96e 100644
--- a/packages/js/product-editor/src/components/details-categories-field/use-category-search.ts
+++ b/packages/js/product-editor/src/components/details-categories-field/use-category-search.ts
@@ -257,32 +257,6 @@ export const useCategorySearch = () => {
 
 	const categoryTreeKeyValues = categoriesAndNewItem[ 2 ];
 
-	/**
-	 * getFilteredItems callback for use in the SelectControl component.
-	 */
-	const getFilteredItems = useCallback(
-		(
-			allItems: ProductCategoryNode[],
-			inputValue: string,
-			selectedItems: ProductCategoryNode[]
-		) => {
-			const searchRegex = new RegExp( escapeRegExp( inputValue ), 'i' );
-			return allItems.filter(
-				( item ) =>
-					selectedItems.indexOf( item ) < 0 &&
-					( searchRegex.test( item.name ) ||
-						( categoryTreeKeyValues[ item.id ] &&
-							categoryTreeKeyValues[ item.id ].isOpen ) )
-			);
-		},
-		[ categoriesAndNewItem ]
-	);
-
-	/**
-	 * this is the same as getFilteredItems but for the SelectTree component, where item id is a string.
-	 * After all the occurrences of getFilteredItems are migrated to use SelectTree,
-	 * this can become the standard version
-	 */
 	const getFilteredItemsForSelectTree = useCallback(
 		(
 			allItems: TreeItemType[],
@@ -303,7 +277,6 @@ export const useCategorySearch = () => {
 
 	return {
 		searchCategories,
-		getFilteredItems,
 		getFilteredItemsForSelectTree,
 		categoriesSelectList: categoriesAndNewItem[ 0 ],
 		categories: categoriesAndNewItem[ 1 ],
diff --git a/packages/js/product-editor/src/components/editor/editor.tsx b/packages/js/product-editor/src/components/editor/editor.tsx
index c577cdee52c..b8a27b4366d 100644
--- a/packages/js/product-editor/src/components/editor/editor.tsx
+++ b/packages/js/product-editor/src/components/editor/editor.tsx
@@ -36,9 +36,7 @@ import { FullscreenMode, InterfaceSkeleton } from '@wordpress/interface';
  */
 import { Header } from '../header';
 import { BlockEditor } from '../block-editor';
-import { initBlocks } from './init-blocks';
-
-initBlocks();
+import { ValidationProvider } from '../../contexts/validation-context';
 
 export type ProductEditorSettings = Partial<
 	EditorSettings & EditorBlockListSettings
@@ -65,31 +63,33 @@ export function Editor( { product, settings }: EditorProps ) {
 					<ShortcutProvider>
 						<FullscreenMode isActive={ false } />
 						<SlotFillProvider>
-							<InterfaceSkeleton
-								header={
-									<Header
-										productName={ product.name }
-										onTabSelect={ setSelectedTab }
-									/>
-								}
-								content={
-									<>
-										<BlockEditor
-											settings={ settings }
-											product={ product }
-											context={ {
-												selectedTab,
-												postType: 'product',
-												postId: product.id,
-											} }
+							<ValidationProvider initialValue={ product }>
+								<InterfaceSkeleton
+									header={
+										<Header
+											productName={ product.name }
+											onTabSelect={ setSelectedTab }
 										/>
-										{ /* @ts-expect-error 'scope' does exist. @types/wordpress__plugins is outdated. */ }
-										<PluginArea scope="woocommerce-product-block-editor" />
-									</>
-								}
-							/>
+									}
+									content={
+										<>
+											<BlockEditor
+												settings={ settings }
+												product={ product }
+												context={ {
+													selectedTab,
+													postType: 'product',
+													postId: product.id,
+												} }
+											/>
+											{ /* @ts-expect-error 'scope' does exist. @types/wordpress__plugins is outdated. */ }
+											<PluginArea scope="woocommerce-product-block-editor" />
+										</>
+									}
+								/>
 
-							<Popover.Slot />
+								<Popover.Slot />
+							</ValidationProvider>
 						</SlotFillProvider>
 					</ShortcutProvider>
 				</EntityProvider>
diff --git a/packages/js/product-editor/src/components/editor/index.ts b/packages/js/product-editor/src/components/editor/index.ts
index 0755485603d..983cad39c0c 100644
--- a/packages/js/product-editor/src/components/editor/index.ts
+++ b/packages/js/product-editor/src/components/editor/index.ts
@@ -1 +1,2 @@
 export * from './editor';
+export * from './init-blocks';
diff --git a/packages/js/product-editor/src/components/editor/init-blocks.ts b/packages/js/product-editor/src/components/editor/init-blocks.ts
index d713bf6e16c..11e8926e637 100644
--- a/packages/js/product-editor/src/components/editor/init-blocks.ts
+++ b/packages/js/product-editor/src/components/editor/init-blocks.ts
@@ -1,7 +1,11 @@
 /**
  * External dependencies
  */
-import { BlockInstance, getBlockType } from '@wordpress/blocks';
+import {
+	BlockInstance,
+	getBlockType,
+	unregisterBlockType,
+} from '@wordpress/blocks';
 import {
 	registerCoreBlocks,
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -14,7 +18,7 @@ import {
  */
 import * as productBlocks from '../../blocks';
 
-export const initBlocks = () => {
+export function initBlocks() {
 	const coreBlocks = __experimentalGetCoreBlocks();
 	const blocks = coreBlocks.filter( ( block: BlockInstance ) => {
 		return ! getBlockType( block.name );
@@ -23,5 +27,15 @@ export const initBlocks = () => {
 	// @ts-ignore An argument is allowed to specify which blocks to register.
 	registerCoreBlocks( blocks );
 
-	Object.values( productBlocks ).forEach( ( init ) => init() );
-};
+	const woocommerceBlocks = Object.values( productBlocks ).map( ( init ) =>
+		init()
+	);
+
+	const registeredBlocks = [ ...blocks, ...woocommerceBlocks ];
+
+	return function unregisterBlocks() {
+		registeredBlocks.forEach(
+			( block ) => block && unregisterBlockType( block.name )
+		);
+	};
+}
diff --git a/packages/js/product-editor/src/components/editor/style.scss b/packages/js/product-editor/src/components/editor/style.scss
index b03b8cea707..d21e479f831 100644
--- a/packages/js/product-editor/src/components/editor/style.scss
+++ b/packages/js/product-editor/src/components/editor/style.scss
@@ -1,18 +1 @@
 @import '@wordpress/interface/src/style.scss';
-
-.interface-interface-skeleton {
-	@include breakpoint( '<782px' ) {
-		top: $adminbar-height-mobile;
-	}
-	top: $adminbar-height;
-	background-color: $white;
-}
-
-.interface-interface-skeleton__sidebar {
-	width: 280px;
-}
-
-.interface-interface-skeleton__header {
-	// Higher than the sidebar which has a z-index of 90.
-	z-index: 100;
-}
diff --git a/packages/js/product-editor/src/components/header/hooks/use-preview/use-preview.tsx b/packages/js/product-editor/src/components/header/hooks/use-preview/use-preview.tsx
index 4ea6a32af81..84124775362 100644
--- a/packages/js/product-editor/src/components/header/hooks/use-preview/use-preview.tsx
+++ b/packages/js/product-editor/src/components/header/hooks/use-preview/use-preview.tsx
@@ -9,6 +9,12 @@ import { useRef } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { MouseEvent } from 'react';
 
+/**
+ * Internal dependencies
+ */
+import { useValidations } from '../../../../contexts/validation-context';
+import { WPError } from '../../../../utils/get-product-error-message';
+
 export function usePreview( {
 	disabled,
 	onClick,
@@ -17,7 +23,7 @@ export function usePreview( {
 	...props
 }: Omit< Button.AnchorProps, 'aria-disabled' | 'variant' | 'href' > & {
 	onSaveSuccess?( product: Product ): void;
-	onSaveError?( error: Error ): void;
+	onSaveError?( error: WPError ): void;
 } ): Button.AnchorProps {
 	const anchorRef = useRef< HTMLAnchorElement >();
 
@@ -41,8 +47,6 @@ export function usePreview( {
 		( select ) => {
 			const { hasEditsForEntityRecord, isSavingEntityRecord } =
 				select( 'core' );
-			const { isPostSavingLocked } = select( 'core/editor' );
-			const isSavingLocked = isPostSavingLocked();
 			const isSaving = isSavingEntityRecord< boolean >(
 				'postType',
 				'product',
@@ -50,7 +54,7 @@ export function usePreview( {
 			);
 
 			return {
-				isDisabled: isSavingLocked || isSaving,
+				isDisabled: isSaving,
 				hasEdits: hasEditsForEntityRecord< boolean >(
 					'postType',
 					'product',
@@ -61,7 +65,9 @@ export function usePreview( {
 		[ productId ]
 	);
 
-	const ariaDisabled = disabled || isDisabled;
+	const { isValidating, validate } = useValidations();
+
+	const ariaDisabled = disabled || isDisabled || isValidating;
 
 	const { editEntityRecord, saveEditedEntityRecord } = useDispatch( 'core' );
 
@@ -97,6 +103,8 @@ export function usePreview( {
 		event.preventDefault();
 
 		try {
+			await validate();
+
 			// If the product status is `auto-draft` it's not possible to
 			// reach the preview page, so the status is changed to `draft`
 			// before redirecting.
@@ -110,7 +118,10 @@ export function usePreview( {
 			const publishedProduct = await saveEditedEntityRecord< Product >(
 				'postType',
 				'product',
-				productId
+				productId,
+				{
+					throwOnError: true,
+				}
 			);
 
 			// Redirect using the default anchor behaviour. This way, the usage
@@ -122,7 +133,7 @@ export function usePreview( {
 			}
 		} catch ( error ) {
 			if ( onSaveError ) {
-				onSaveError( error as Error );
+				onSaveError( error as WPError );
 			}
 		}
 	}
diff --git a/packages/js/product-editor/src/components/header/hooks/use-publish/use-publish.tsx b/packages/js/product-editor/src/components/header/hooks/use-publish/use-publish.tsx
index ba149acd9f6..6918e91a615 100644
--- a/packages/js/product-editor/src/components/header/hooks/use-publish/use-publish.tsx
+++ b/packages/js/product-editor/src/components/header/hooks/use-publish/use-publish.tsx
@@ -8,6 +8,12 @@ import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { MouseEvent } from 'react';
 
+/**
+ * Internal dependencies
+ */
+import { useValidations } from '../../../../contexts/validation-context';
+import { WPError } from '../../../../utils/get-product-error-message';
+
 export function usePublish( {
 	disabled,
 	onClick,
@@ -16,7 +22,7 @@ export function usePublish( {
 	...props
 }: Omit< Button.ButtonProps, 'aria-disabled' | 'variant' | 'children' > & {
 	onPublishSuccess?( product: Product ): void;
-	onPublishError?( error: Error ): void;
+	onPublishError?( error: WPError ): void;
 } ): Button.ButtonProps {
 	const [ productId ] = useEntityProp< number >(
 		'postType',
@@ -29,22 +35,14 @@ export function usePublish( {
 		'status'
 	);
 
-	const { hasEdits, isDisabled, isBusy } = useSelect(
+	const { isValidating, validate } = useValidations();
+
+	const { isSaving } = useSelect(
 		( select ) => {
-			const { hasEditsForEntityRecord, isSavingEntityRecord } =
-				select( 'core' );
-			const { isPostSavingLocked } = select( 'core/editor' );
-			const isSavingLocked = isPostSavingLocked();
-			const isSaving = isSavingEntityRecord< boolean >(
-				'postType',
-				'product',
-				productId
-			);
+			const { isSavingEntityRecord } = select( 'core' );
 
 			return {
-				isDisabled: isSavingLocked || isSaving,
-				isBusy: isSaving,
-				hasEdits: hasEditsForEntityRecord< boolean >(
+				isSaving: isSavingEntityRecord< boolean >(
 					'postType',
 					'product',
 					productId
@@ -54,22 +52,20 @@ export function usePublish( {
 		[ productId ]
 	);
 
+	const isBusy = isSaving || isValidating;
+
 	const isCreating = productStatus === 'auto-draft';
-	const ariaDisabled =
-		disabled || isDisabled || ( productStatus === 'publish' && ! hasEdits );
 
 	const { editEntityRecord, saveEditedEntityRecord } = useDispatch( 'core' );
 
 	async function handleClick( event: MouseEvent< HTMLButtonElement > ) {
-		if ( ariaDisabled ) {
-			return event.preventDefault();
-		}
-
 		if ( onClick ) {
 			onClick( event );
 		}
 
 		try {
+			await validate();
+
 			// The publish button click not only change the status of the product
 			// but also save all the pending changes. So even if the status is
 			// publish it's possible to save the product too.
@@ -82,15 +78,18 @@ export function usePublish( {
 			const publishedProduct = await saveEditedEntityRecord< Product >(
 				'postType',
 				'product',
-				productId
+				productId,
+				{
+					throwOnError: true,
+				}
 			);
 
-			if ( onPublishSuccess ) {
+			if ( publishedProduct && onPublishSuccess ) {
 				onPublishSuccess( publishedProduct );
 			}
 		} catch ( error ) {
 			if ( onPublishError ) {
-				onPublishError( error as Error );
+				onPublishError( error as WPError );
 			}
 		}
 	}
@@ -100,7 +99,6 @@ export function usePublish( {
 			? __( 'Add', 'woocommerce' )
 			: __( 'Save', 'woocommerce' ),
 		...props,
-		'aria-disabled': ariaDisabled,
 		isBusy,
 		variant: 'primary',
 		onClick: handleClick,
diff --git a/packages/js/product-editor/src/components/header/hooks/use-save-draft/use-save-draft.tsx b/packages/js/product-editor/src/components/header/hooks/use-save-draft/use-save-draft.tsx
index 06aa6b00312..05c5414d7d8 100644
--- a/packages/js/product-editor/src/components/header/hooks/use-save-draft/use-save-draft.tsx
+++ b/packages/js/product-editor/src/components/header/hooks/use-save-draft/use-save-draft.tsx
@@ -10,6 +10,12 @@ import { check } from '@wordpress/icons';
 import { createElement, Fragment } from '@wordpress/element';
 import { MouseEvent, ReactNode } from 'react';
 
+/**
+ * Internal dependencies
+ */
+import { useValidations } from '../../../../contexts/validation-context';
+import { WPError } from '../../../../utils/get-product-error-message';
+
 export function useSaveDraft( {
 	disabled,
 	onClick,
@@ -18,7 +24,7 @@ export function useSaveDraft( {
 	...props
 }: Omit< Button.ButtonProps, 'aria-disabled' | 'variant' | 'children' > & {
 	onSaveSuccess?( product: Product ): void;
-	onSaveError?( error: Error ): void;
+	onSaveError?( error: WPError ): void;
 } ): Button.ButtonProps {
 	const [ productId ] = useEntityProp< number >(
 		'postType',
@@ -35,8 +41,6 @@ export function useSaveDraft( {
 		( select ) => {
 			const { hasEditsForEntityRecord, isSavingEntityRecord } =
 				select( 'core' );
-			const { isPostSavingLocked } = select( 'core/editor' );
-			const isSavingLocked = isPostSavingLocked();
 			const isSaving = isSavingEntityRecord< boolean >(
 				'postType',
 				'product',
@@ -44,7 +48,7 @@ export function useSaveDraft( {
 			);
 
 			return {
-				isDisabled: isSavingLocked || isSaving,
+				isDisabled: isSaving,
 				hasEdits: hasEditsForEntityRecord< boolean >(
 					'postType',
 					'product',
@@ -55,8 +59,13 @@ export function useSaveDraft( {
 		[ productId ]
 	);
 
+	const { isValidating, validate } = useValidations();
+
 	const ariaDisabled =
-		disabled || isDisabled || ( productStatus !== 'publish' && ! hasEdits );
+		disabled ||
+		isDisabled ||
+		( productStatus !== 'publish' && ! hasEdits ) ||
+		isValidating;
 
 	const { editEntityRecord, saveEditedEntityRecord } = useDispatch( 'core' );
 
@@ -70,13 +79,18 @@ export function useSaveDraft( {
 		}
 
 		try {
+			await validate();
+
 			await editEntityRecord( 'postType', 'product', productId, {
 				status: 'draft',
 			} );
 			const publishedProduct = await saveEditedEntityRecord< Product >(
 				'postType',
 				'product',
-				productId
+				productId,
+				{
+					throwOnError: true,
+				}
 			);
 
 			if ( onSaveSuccess ) {
@@ -84,7 +98,7 @@ export function useSaveDraft( {
 			}
 		} catch ( error ) {
 			if ( onSaveError ) {
-				onSaveError( error as Error );
+				onSaveError( error as WPError );
 			}
 		}
 	}
diff --git a/packages/js/product-editor/src/components/header/preview-button/preview-button.tsx b/packages/js/product-editor/src/components/header/preview-button/preview-button.tsx
index e125246b2ea..be56cb75996 100644
--- a/packages/js/product-editor/src/components/header/preview-button/preview-button.tsx
+++ b/packages/js/product-editor/src/components/header/preview-button/preview-button.tsx
@@ -12,6 +12,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
+import { getProductErrorMessage } from '../../../utils/get-product-error-message';
 import { usePreview } from '../hooks/use-preview';
 
 export function PreviewButton( {
@@ -36,9 +37,11 @@ export function PreviewButton( {
 				navigateTo( { url } );
 			}
 		},
-		onSaveError() {
+		onSaveError( error ) {
+			const message = getProductErrorMessage( error );
+
 			createErrorNotice(
-				__( 'Failed to preview product.', 'woocommerce' )
+				message || __( 'Failed to preview product.', 'woocommerce' )
 			);
 		},
 	} );
diff --git a/packages/js/product-editor/src/components/header/publish-button/publish-button.tsx b/packages/js/product-editor/src/components/header/publish-button/publish-button.tsx
index c406134661f..05dc6c2bcba 100644
--- a/packages/js/product-editor/src/components/header/publish-button/publish-button.tsx
+++ b/packages/js/product-editor/src/components/header/publish-button/publish-button.tsx
@@ -13,6 +13,7 @@ import { useEntityProp } from '@wordpress/core-data';
 /**
  * Internal dependencies
  */
+import { getProductErrorMessage } from '../../../utils/get-product-error-message';
 import { recordProductEvent } from '../../../utils/record-product-event';
 import { usePublish } from '../hooks/use-publish';
 
@@ -62,12 +63,13 @@ export function PublishButton(
 				navigateTo( { url } );
 			}
 		},
-		onPublishError() {
-			const noticeContent = isCreating
+		onPublishError( error ) {
+			const defaultMessage = isCreating
 				? __( 'Failed to create product.', 'woocommerce' )
 				: __( 'Failed to publish product.', 'woocommerce' );
 
-			createErrorNotice( noticeContent );
+			const message = getProductErrorMessage( error );
+			createErrorNotice( message || defaultMessage );
 		},
 	} );
 
diff --git a/packages/js/product-editor/src/components/header/save-draft-button/save-draft-button.tsx b/packages/js/product-editor/src/components/header/save-draft-button/save-draft-button.tsx
index e070756a69e..0dee7d51a38 100644
--- a/packages/js/product-editor/src/components/header/save-draft-button/save-draft-button.tsx
+++ b/packages/js/product-editor/src/components/header/save-draft-button/save-draft-button.tsx
@@ -12,6 +12,7 @@ import { useEntityProp } from '@wordpress/core-data';
 /**
  * Internal dependencies
  */
+import { getProductErrorMessage } from '../../../utils/get-product-error-message';
 import { recordProductEvent } from '../../../utils/record-product-event';
 import { useSaveDraft } from '../hooks/use-save-draft';
 
@@ -41,9 +42,11 @@ export function SaveDraftButton(
 				navigateTo( { url } );
 			}
 		},
-		onSaveError() {
+		onSaveError( error ) {
+			const message = getProductErrorMessage( error );
+
 			createErrorNotice(
-				__( 'Failed to update product.', 'woocommerce' )
+				message || __( 'Failed to update product.', 'woocommerce' )
 			);
 		},
 	} );
diff --git a/packages/js/product-editor/src/components/iframe-editor/editor-canvas.tsx b/packages/js/product-editor/src/components/iframe-editor/editor-canvas.tsx
index b2f14718e23..44cfe5e1587 100644
--- a/packages/js/product-editor/src/components/iframe-editor/editor-canvas.tsx
+++ b/packages/js/product-editor/src/components/iframe-editor/editor-canvas.tsx
@@ -3,22 +3,29 @@
  */
 import { createElement, Fragment } from '@wordpress/element';
 import {
+	EditorSettings,
+	EditorBlockListSettings,
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore No types for this exist yet.
 	__unstableIframe as Iframe,
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore No types for this exist yet.
 	__unstableUseMouseMoveTypingReset as useMouseMoveTypingReset,
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore No types for this exist yet.
+	__unstableEditorStyles as EditorStyles,
 } from '@wordpress/block-editor';
 
 type EditorCanvasProps = {
-	enableResizing: boolean;
 	children: React.ReactNode;
+	enableResizing: boolean;
+	settings: Partial< EditorSettings & EditorBlockListSettings > | undefined;
 };
 
 export function EditorCanvas( {
-	enableResizing,
 	children,
+	enableResizing,
+	settings,
 	...props
 }: EditorCanvasProps ) {
 	const mouseMoveTypingRef = useMouseMoveTypingReset();
@@ -26,6 +33,7 @@ export function EditorCanvas( {
 		<Iframe
 			head={
 				<>
+					<EditorStyles styles={ settings?.styles } />
 					<style>
 						{
 							// Forming a "block formatting context" to prevent margin collapsing.
diff --git a/packages/js/product-editor/src/components/iframe-editor/iframe-editor.tsx b/packages/js/product-editor/src/components/iframe-editor/iframe-editor.tsx
index 2bf508964d0..bba2cba3aac 100644
--- a/packages/js/product-editor/src/components/iframe-editor/iframe-editor.tsx
+++ b/packages/js/product-editor/src/components/iframe-editor/iframe-editor.tsx
@@ -4,13 +4,8 @@
 import { BlockInstance } from '@wordpress/blocks';
 import { Popover } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
-import {
-	createElement,
-	useCallback,
-	useEffect,
-	useState,
-} from '@wordpress/element';
-import { useDebounce, useResizeObserver } from '@wordpress/compose';
+import { createElement, useEffect, useState } from '@wordpress/element';
+import { useResizeObserver } from '@wordpress/compose';
 import {
 	BlockEditorProvider,
 	BlockInspector,
@@ -35,16 +30,18 @@ import { ResizableEditor } from './resizable-editor';
 
 type IframeEditorProps = {
 	initialBlocks?: BlockInstance[];
-	onChange: ( blocks: BlockInstance[] ) => void;
+	onChange?: ( blocks: BlockInstance[] ) => void;
 	onClose?: () => void;
+	onInput?: ( blocks: BlockInstance[] ) => void;
 	settings?: Partial< EditorSettings & EditorBlockListSettings > | undefined;
 };
 
 export function IframeEditor( {
 	initialBlocks = [],
-	onChange,
+	onChange = () => {},
 	onClose,
-	settings,
+	onInput,
+	settings: __settings,
 }: IframeEditorProps ) {
 	const [ resizeObserver, sizes ] = useResizeObserver();
 	const [ blocks, setBlocks ] = useState< BlockInstance[] >( initialBlocks );
@@ -66,28 +63,22 @@ export function IframeEditor( {
 		updateSettings( productBlockEditorSettings );
 	}, [] );
 
-	const handleChange = useCallback(
-		( updatedBlocks: BlockInstance[] ) => {
-			onChange( updatedBlocks );
-		},
-		[ onChange ]
-	);
-
-	const debouncedOnChange = useDebounce( handleChange, 200 );
+	const settings = __settings || parentEditorSettings;
 
 	return (
 		<div className="woocommerce-iframe-editor">
 			<BlockEditorProvider
 				settings={ {
-					...( settings || parentEditorSettings ),
+					...settings,
 					hasFixedToolbar: true,
 					templateLock: false,
 				} }
 				value={ blocks }
 				onChange={ ( updatedBlocks: BlockInstance[] ) => {
 					setBlocks( updatedBlocks );
-					debouncedOnChange( updatedBlocks );
+					onChange( updatedBlocks );
 				} }
+				onInput={ onInput }
 				useSubRegistry={ true }
 			>
 				<BlockTools
@@ -104,14 +95,23 @@ export function IframeEditor( {
 					{ /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ }
 					{ /* @ts-ignore */ }
 					<BlockEditorKeyboardShortcuts.Register />
-					{ onClose && <BackButton onClick={ onClose } /> }
+					{ onClose && (
+						<BackButton
+							onClick={ () => {
+								setTimeout( onClose, 550 );
+							} }
+						/>
+					) }
 					<ResizableEditor
 						enableResizing={ true }
 						// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 						// @ts-ignore This accepts numbers or strings.
 						height={ sizes.height ?? '100%' }
 					>
-						<EditorCanvas enableResizing={ true }>
+						<EditorCanvas
+							enableResizing={ true }
+							settings={ settings }
+						>
 							{ resizeObserver }
 							<BlockList className="edit-site-block-editor__block-list wp-site-blocks" />
 						</EditorCanvas>
diff --git a/packages/js/product-editor/src/components/index.ts b/packages/js/product-editor/src/components/index.ts
index 59144b84e02..dc54d3a9c1e 100644
--- a/packages/js/product-editor/src/components/index.ts
+++ b/packages/js/product-editor/src/components/index.ts
@@ -13,6 +13,7 @@ export { DetailsDescriptionField as __experimentalDetailsDescriptionField } from
 export { WooProductMoreMenuItem as __experimentalWooProductMoreMenuItem } from './header';
 export {
 	Editor as __experimentalEditor,
+	initBlocks as __experimentalInitBlocks,
 	ProductEditorSettings,
 } from './editor';
 export {
diff --git a/packages/js/product-editor/src/components/modal-editor/modal-editor.tsx b/packages/js/product-editor/src/components/modal-editor/modal-editor.tsx
index 0c89b1eed1b..7e1ffac5e79 100644
--- a/packages/js/product-editor/src/components/modal-editor/modal-editor.tsx
+++ b/packages/js/product-editor/src/components/modal-editor/modal-editor.tsx
@@ -8,6 +8,7 @@ import {
 	EditorBlockListSettings,
 } from '@wordpress/block-editor';
 import { Modal } from '@wordpress/components';
+import { useDebounce } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -28,16 +29,29 @@ export function ModalEditor( {
 	onClose,
 	title,
 }: ModalEditorProps ) {
+	const debouncedOnChange = useDebounce( ( blocks: BlockInstance[] ) => {
+		onChange( blocks );
+	}, 250 );
+
+	function handleClose() {
+		const blocks = debouncedOnChange.flush();
+		if ( blocks ) {
+			onChange( blocks );
+		}
+		onClose();
+	}
+
 	return (
 		<Modal
 			className="woocommerce-modal-editor"
 			title={ title }
-			onRequestClose={ onClose }
+			onRequestClose={ handleClose }
 			shouldCloseOnClickOutside={ false }
 		>
 			<IframeEditor
 				initialBlocks={ initialBlocks }
-				onChange={ onChange }
+				onInput={ debouncedOnChange }
+				onChange={ debouncedOnChange }
 			/>
 		</Modal>
 	);
diff --git a/packages/js/product-editor/src/components/radio-field/style.scss b/packages/js/product-editor/src/components/radio-field/style.scss
index fe7ad92004d..0d2b2f0006c 100644
--- a/packages/js/product-editor/src/components/radio-field/style.scss
+++ b/packages/js/product-editor/src/components/radio-field/style.scss
@@ -6,18 +6,19 @@
 			display: block;
 			line-height: 1.5;
 		}
-		margin-bottom: $gap-large;
+		margin-bottom: $gap-small;
 	}
 
 	&__title {
-		font-size: 16px;
-		font-weight: 600;
+		font-size: 11px;
+		font-weight: 500;
 		color: #1e1e1e;
+		text-transform: uppercase;
 	}
 
 	&__description {
 		font-size: 13px;
-		color: #1e1e1e;
+		color: $gray-700;
 	}
 
 	.components-base-control__field > .components-v-stack {
diff --git a/packages/js/product-editor/src/components/shipping-dimensions-image/shipping-dimensions-image.tsx b/packages/js/product-editor/src/components/shipping-dimensions-image/shipping-dimensions-image.tsx
index f9ac4c98739..39b07afd003 100644
--- a/packages/js/product-editor/src/components/shipping-dimensions-image/shipping-dimensions-image.tsx
+++ b/packages/js/product-editor/src/components/shipping-dimensions-image/shipping-dimensions-image.tsx
@@ -10,90 +10,111 @@ import { ShippingDimensionsImageProps } from './types';
 
 export function ShippingDimensionsImage( {
 	highlight,
+	labels = {},
 	...props
 }: ShippingDimensionsImageProps ) {
 	return (
 		<svg
-			{ ...props }
-			viewBox="0 0 288 195"
+			width="295"
+			height="195"
+			viewBox="0 0 295 195"
 			fill="none"
 			xmlns="http://www.w3.org/2000/svg"
+			{ ...props }
 		>
 			{ /* Side A */ }
 			<path
-				d="M10.4922 134.221V35.2617C10.4922 33.8539 11.9079 32.8867 13.2193 33.3986L98.3109 66.6076C99.0711 66.9043 99.5748 67.633 99.5837 68.449L100.703 171.089C100.719 172.534 99.2449 173.518 97.9167 172.95L11.7054 136.06C10.9695 135.745 10.4922 135.022 10.4922 134.221Z"
-				fill={ highlight === 'A' ? '#F0F6FC' : '#F6F7F7' }
+				d="M11.5664 134.604V35.3599C11.5664 33.9482 12.9862 32.9782 14.3014 33.4915L99.6373 66.7959C100.4 67.0935 100.905 67.8243 100.914 68.6426L102.037 171.578C102.052 173.027 100.574 174.014 99.2419 173.444L12.7831 136.448C12.0451 136.132 11.5664 135.407 11.5664 134.604Z"
+				fill={ highlight === 'A' ? '#F0F6FC' : '#FFFFFF' }
 			/>
 			<path
-				d="M43.9062 84.2338V44.7946L187.953 11.877L211.485 20.5392L67.0049 53.3546V93.6078L43.9062 84.2338Z"
-				fill="#F0F0F0"
-				stroke="#DDDDDD"
-				strokeWidth="2"
+				d="M11.5664 134.603V35.3599C11.5664 33.9482 12.9862 32.9782 14.3014 33.4915L99.624 66.7908C100.393 67.0909 100.9 67.8314 100.901 68.6569L101.024 174.131L12.7844 136.447C12.0457 136.132 11.5664 135.406 11.5664 134.603Z"
+				stroke="#E0E0E0"
+				strokeWidth="2.00574"
 			/>
+			{ /* Line A */ }
 			<path
-				d="M43.9062 99.8824V90.6973L67.0049 100.301V109.256L43.9062 99.8824Z"
-				fill="#F0F0F0"
-				stroke="#DDDDDD"
-				strokeWidth="2"
-			/>
-			<path
-				d="M10.4922 134.22V35.2617C10.4922 33.8539 11.9079 32.8867 13.2193 33.3986L98.2977 66.6025C99.0645 66.9017 99.5696 67.6402 99.5705 68.4633L99.6936 173.635L11.7067 136.06C10.9701 135.745 10.4922 135.021 10.4922 134.22Z"
-				stroke="#DDDDDD"
-				strokeWidth="2"
+				d="M1.25977 150.388L86.0112 188.183"
+				stroke={ highlight === 'A' ? '#006FAD' : '#CCCCCC' }
+				strokeWidth="1.50431"
+				strokeMiterlimit="16"
 			/>
 			{ /* Side B */ }
 			<path
-				d="M249.015 32.8879L99.5703 66.7689V172.489C99.5703 173.801 100.812 174.758 102.081 174.423L249.968 135.378C250.846 135.146 251.458 134.352 251.458 133.444V34.8384C251.458 33.5554 250.267 32.6042 249.015 32.8879Z"
-				fill={ highlight === 'B' ? '#F0F6FC' : '#F6F7F7' }
-				stroke="#DDDDDD"
-				strokeWidth="2"
+				d="M250.775 32.9793L100.9 66.9577V172.981C100.9 174.297 102.146 175.257 103.418 174.921L251.73 135.764C252.611 135.531 253.224 134.735 253.224 133.824V34.9354C253.224 33.6488 252.03 32.6948 250.775 32.9793Z"
+				fill={ highlight === 'B' ? '#F0F6FC' : '#FFFFFF' }
+				stroke="#E0E0E0"
+				strokeWidth="2.00574"
+			/>
+			{ /* Line C */ }
+			<path
+				d="M270.402 28.9875V132.064"
+				stroke={ highlight === 'C' ? '#006FAD' : '#CCCCCC' }
+				strokeWidth="1.50431"
+				strokeMiterlimit="16"
+			/>
+			{ /* Line B */ }
+			<path
+				d="M257.804 152.679L107.771 192.765"
+				stroke={ highlight === 'B' ? '#006FAD' : '#CCCCCC' }
+				strokeWidth="1.50431"
+				strokeMiterlimit="16"
 			/>
 			<path
-				d="M154.224 117.401L115.969 126.13C115.059 126.337 114.414 127.147 114.414 128.08V154.212C114.414 155.526 115.658 156.483 116.928 156.145L155.182 145.98C156.058 145.747 156.668 144.954 156.668 144.047V119.351C156.668 118.067 155.475 117.115 154.224 117.401Z"
-				fill="#F0F0F0"
-				stroke="#DDDDDD"
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-				strokeDasharray="6 6"
-			/>
-			<path
-				d="M12.0625 33.3189L159.943 1.6182C160.304 1.54091 160.679 1.5648 161.027 1.68725L249.4 32.7973"
-				stroke="#DDDDDD"
-				strokeWidth="2"
+				d="M13.1406 33.41L161.446 1.61817C161.808 1.54066 162.184 1.56462 162.533 1.68742L251.16 32.8868"
+				stroke="#E0E0E0"
+				strokeWidth="2.00574"
 			/>
+			{ /* Label C */ }
+			{ labels.C ? (
+				<text
+					x="280"
+					y="85"
+					fontSize={ 11 }
+					fill={ highlight === 'C' ? '#007CBA' : '#949494' }
+				>
+					{ labels.C }
+				</text>
+			) : (
+				<path
+					d="M282.123 80.7892C282.123 79.5323 282.435 78.5405 283.058 77.8136C283.685 77.0867 284.537 76.7233 285.615 76.7233C286.467 76.7233 287.192 76.9739 287.79 77.4752C288.391 77.9729 288.741 78.6175 288.837 79.4088H287.639C287.525 78.9326 287.285 78.553 286.92 78.2701C286.558 77.9873 286.123 77.8458 285.615 77.8458C284.92 77.8458 284.368 78.1108 283.96 78.6407C283.556 79.1671 283.353 79.8833 283.353 80.7892C283.353 81.6915 283.556 82.4077 283.96 82.9376C284.368 83.464 284.922 83.7272 285.62 83.7272C286.132 83.7272 286.569 83.5983 286.93 83.3405C287.296 83.0826 287.532 82.7353 287.639 82.2985H288.837C288.73 83.0647 288.382 83.6824 287.795 84.1515C287.208 84.617 286.483 84.8497 285.62 84.8497C284.542 84.8497 283.69 84.4863 283.063 83.7594C282.437 83.0325 282.123 82.0424 282.123 80.7892Z"
+					fill={ highlight === 'C' ? '#007CBA' : '#949494' }
+				/>
+			) }
 
-			{ /* Arrow A */ }
-			<path
-				d="M0.214844 149.961L5.30102 156.971L8.8282 149.061L0.214844 149.961ZM84.7236 187.648L79.6374 180.638L76.1102 188.548L84.7236 187.648ZM6.07417 153.396L78.2533 185.584L78.8642 184.214L6.68509 152.026L6.07417 153.396Z"
-				fill={ highlight === 'A' ? '#007CBA' : '#BBBBBB' }
-			/>
-			{ /* Arrow B */ }
-			<path
-				d="M256.025 152.246L247.662 149.998L249.897 158.365L256.025 152.246ZM106.422 192.216L114.785 194.463L112.55 186.097L106.422 192.216ZM249.31 153.263L112.75 189.749L113.137 191.198L249.698 154.713L249.31 153.263Z"
-				fill={ highlight === 'B' ? '#007CBA' : '#BBBBBB' }
-			/>
-			{ /* Arrow C */ }
-			<path
-				d="M268.586 28.908L264.256 36.408H272.916L268.586 28.908ZM268.586 131.689L272.916 124.189H264.256L268.586 131.689ZM267.836 35.658V124.939H269.336V35.658H267.836Z"
-				fill={ highlight === 'C' ? '#007CBA' : '#BBBBBB' }
-			/>
+			{ /* Label B */ }
+			{ labels.B ? (
+				<text
+					x="188"
+					y="190"
+					fontSize={ 11 }
+					fill={ highlight === 'B' ? '#007CBA' : '#949494' }
+				>
+					{ labels.B }
+				</text>
+			) : (
+				<path
+					d="M192.281 189.611V181.861H195.396C196.123 181.861 196.692 182.034 197.104 182.382C197.519 182.725 197.727 183.196 197.727 183.794C197.727 184.199 197.596 184.562 197.335 184.885C197.073 185.203 196.751 185.395 196.368 185.459V185.551C196.891 185.604 197.312 185.803 197.63 186.147C197.953 186.487 198.114 186.91 198.114 187.414C198.114 188.098 197.879 188.635 197.41 189.026C196.941 189.416 196.293 189.611 195.466 189.611H192.281ZM193.484 188.591H195.224C195.765 188.591 196.177 188.483 196.459 188.268C196.742 188.054 196.884 187.74 196.884 187.328C196.884 186.924 196.737 186.618 196.443 186.41C196.15 186.199 195.72 186.093 195.154 186.093H193.484V188.591ZM193.484 185.142H194.913C195.442 185.142 195.844 185.048 196.116 184.858C196.391 184.664 196.529 184.383 196.529 184.015C196.529 183.656 196.404 183.379 196.153 183.182C195.906 182.981 195.561 182.881 195.117 182.881H193.484V185.142Z"
+					fill={ highlight === 'B' ? '#007CBA' : '#949494' }
+				/>
+			) }
 
-			{ /* Letter A */ }
-			<path
-				d="M26.8564 184.66L29.6548 176.909H30.9492L33.7476 184.66H32.4692L31.7603 182.603H28.8062L28.0918 184.66H26.8564ZM29.1123 181.593H31.4541L30.3315 178.316H30.2402L29.1123 181.593Z"
-				fill={ highlight === 'A' ? '#007CBA' : '#757575' }
-			/>
-			{ /* Letter B */ }
-			<path
-				d="M189.621 189.228V181.478H192.736C193.463 181.478 194.032 181.651 194.444 181.999C194.859 182.342 195.067 182.813 195.067 183.411C195.067 183.816 194.936 184.179 194.675 184.501C194.413 184.82 194.091 185.012 193.708 185.076V185.167C194.231 185.221 194.652 185.42 194.97 185.764C195.292 186.104 195.454 186.526 195.454 187.031C195.454 187.715 195.219 188.252 194.75 188.643C194.281 189.033 193.633 189.228 192.806 189.228H189.621ZM190.824 188.208H192.564C193.105 188.208 193.516 188.1 193.799 187.885C194.082 187.67 194.224 187.357 194.224 186.945C194.224 186.541 194.077 186.235 193.783 186.027C193.49 185.816 193.06 185.71 192.494 185.71H190.824V188.208ZM190.824 184.759H192.252C192.782 184.759 193.183 184.664 193.456 184.475C193.731 184.281 193.869 184 193.869 183.631C193.869 183.273 193.744 182.996 193.493 182.799C193.246 182.598 192.901 182.498 192.457 182.498H190.824V184.759Z"
-				fill={ highlight === 'B' ? '#007CBA' : '#757575' }
-			/>
-			{ /* Letter C */ }
-			<path
-				d="M279.519 80.2898C279.519 79.033 279.83 78.0411 280.453 77.3142C281.08 76.5873 281.932 76.2239 283.01 76.2239C283.862 76.2239 284.587 76.4745 285.185 76.9758C285.787 77.4736 286.136 78.1181 286.232 78.9094H285.035C284.92 78.4332 284.68 78.0536 284.315 77.7708C283.953 77.4879 283.518 77.3464 283.01 77.3464C282.315 77.3464 281.764 77.6114 281.355 78.1414C280.951 78.6677 280.749 79.3839 280.749 80.2898C280.749 81.1921 280.951 81.9083 281.355 82.4382C281.764 82.9646 282.317 83.2278 283.015 83.2278C283.527 83.2278 283.964 83.0989 284.326 82.8411C284.691 82.5833 284.927 82.2359 285.035 81.7991H286.232C286.125 82.5653 285.778 83.183 285.19 83.6521C284.603 84.1176 283.878 84.3503 283.015 84.3503C281.937 84.3503 281.085 83.9869 280.458 83.26C279.832 82.5331 279.519 81.5431 279.519 80.2898Z"
-				fill={ highlight === 'C' ? '#007CBA' : '#757575' }
-			/>
+			{ /* Label A */ }
+			{ labels.A ? (
+				<text
+					x="18"
+					y="185"
+					fontSize={ 11 }
+					fill={ highlight === 'A' ? '#007CBA' : '#949494' }
+				>
+					{ labels.A }
+				</text>
+			) : (
+				<path
+					d="M22.7694 185.149L25.5678 177.399H26.8622L29.6605 185.149H28.3822L27.6732 183.092H24.7191L24.0048 185.149H22.7694ZM25.0253 182.082H27.3671L26.2445 178.806H26.1532L25.0253 182.082Z"
+					fill={ highlight === 'A' ? '#007CBA' : '#949494' }
+				/>
+			) }
 		</svg>
 	);
 }
diff --git a/packages/js/product-editor/src/components/shipping-dimensions-image/types.ts b/packages/js/product-editor/src/components/shipping-dimensions-image/types.ts
index 8824a9c248f..119c9cf5c4e 100644
--- a/packages/js/product-editor/src/components/shipping-dimensions-image/types.ts
+++ b/packages/js/product-editor/src/components/shipping-dimensions-image/types.ts
@@ -2,4 +2,9 @@ export type HighlightSides = 'A' | 'B' | 'C';
 
 export type ShippingDimensionsImageProps = React.SVGProps< SVGSVGElement > & {
 	highlight?: HighlightSides;
+	labels?: {
+		A?: string | number;
+		B?: string | number;
+		C?: string | number;
+	};
 };
diff --git a/packages/js/product-editor/src/contexts/validation-context/helpers.ts b/packages/js/product-editor/src/contexts/validation-context/helpers.ts
new file mode 100644
index 00000000000..88068c73bcc
--- /dev/null
+++ b/packages/js/product-editor/src/contexts/validation-context/helpers.ts
@@ -0,0 +1,33 @@
+/**
+ * Internal dependencies
+ */
+import { ValidationErrors } from './types';
+
+export function findFirstInvalidElement< E extends Element = Element >(
+	elementsMap: Record< string, E >,
+	errors: ValidationErrors
+): E | undefined {
+	const fieldRefsWithError = Object.entries( elementsMap ).filter(
+		( [ validatorId, element ] ) =>
+			// Pick the element if it is under the selected tab.
+			element?.closest( '.is-selected[role="tabpanel"]' ) &&
+			Boolean( errors[ validatorId ] )
+	);
+
+	const [ firstFieldRefWithError ] = fieldRefsWithError.sort(
+		( [ , firstElement ], [ , secondElement ] ) => {
+			if (
+				// eslint-disable-next-line no-bitwise
+				firstElement.compareDocumentPosition( secondElement ) &
+				Node.DOCUMENT_POSITION_FOLLOWING
+			) {
+				return -1;
+			}
+			return 1;
+		}
+	);
+
+	const [ , firstElementWithError ] = firstFieldRefWithError ?? [];
+
+	return firstElementWithError;
+}
diff --git a/packages/js/product-editor/src/contexts/validation-context/index.ts b/packages/js/product-editor/src/contexts/validation-context/index.ts
new file mode 100644
index 00000000000..ecee449db60
--- /dev/null
+++ b/packages/js/product-editor/src/contexts/validation-context/index.ts
@@ -0,0 +1,4 @@
+export * from './use-validation';
+export * from './use-validations';
+export * from './validation-provider';
+export * from './types';
diff --git a/packages/js/product-editor/src/contexts/validation-context/types.ts b/packages/js/product-editor/src/contexts/validation-context/types.ts
new file mode 100644
index 00000000000..30aa1b8241b
--- /dev/null
+++ b/packages/js/product-editor/src/contexts/validation-context/types.ts
@@ -0,0 +1,27 @@
+export type ValidatorResponse = Promise< ValidationError >;
+
+export type Validator< T > = ( initialValue?: T ) => ValidatorResponse;
+
+export type ValidationContextProps< T > = {
+	errors: ValidationErrors;
+	registerValidator(
+		validatorId: string,
+		validator: Validator< T >
+	): React.Ref< HTMLElement >;
+	validateField( name: string ): ValidatorResponse;
+	validateAll(): Promise< ValidationErrors >;
+};
+
+export type ValidationProviderProps< T > = {
+	initialValue?: T;
+};
+
+export type ValidationError = string | undefined;
+export type ValidationErrors = Record< string, ValidationError >;
+
+export type ValidatorRegistration = {
+	name: string;
+	ref: React.Ref< HTMLElement >;
+	error?: ValidationError;
+	validate(): ValidatorResponse;
+};
diff --git a/packages/js/product-editor/src/contexts/validation-context/use-validation.ts b/packages/js/product-editor/src/contexts/validation-context/use-validation.ts
new file mode 100644
index 00000000000..3f4ed824e50
--- /dev/null
+++ b/packages/js/product-editor/src/contexts/validation-context/use-validation.ts
@@ -0,0 +1,37 @@
+/**
+ * External dependencies
+ */
+import { useContext, useMemo, useState } from '@wordpress/element';
+import { DependencyList } from 'react';
+
+/**
+ * Internal dependencies
+ */
+import { Validator } from './types';
+import { ValidationContext } from './validation-context';
+
+export function useValidation< T >(
+	validatorId: string,
+	validator: Validator< T >,
+	deps: DependencyList = []
+) {
+	const context = useContext( ValidationContext );
+	const [ isValidating, setIsValidating ] = useState( false );
+
+	const ref = useMemo(
+		() => context.registerValidator( validatorId, validator ),
+		[ validatorId, ...deps ]
+	);
+
+	return {
+		ref,
+		error: context.errors[ validatorId ],
+		isValidating,
+		async validate() {
+			setIsValidating( true );
+			return context.validateField( validatorId ).finally( () => {
+				setIsValidating( false );
+			} );
+		},
+	};
+}
diff --git a/packages/js/product-editor/src/contexts/validation-context/use-validations.ts b/packages/js/product-editor/src/contexts/validation-context/use-validations.ts
new file mode 100644
index 00000000000..9efff3443aa
--- /dev/null
+++ b/packages/js/product-editor/src/contexts/validation-context/use-validations.ts
@@ -0,0 +1,42 @@
+/**
+ * External dependencies
+ */
+import { useContext, useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { ValidationErrors } from './types';
+import { ValidationContext } from './validation-context';
+
+function isInvalid( errors: ValidationErrors ) {
+	return Object.values( errors ).some( Boolean );
+}
+
+export function useValidations() {
+	const context = useContext( ValidationContext );
+	const [ isValidating, setIsValidating ] = useState( false );
+
+	return {
+		isValidating,
+		async validate() {
+			setIsValidating( true );
+			return new Promise< void >( ( resolve, reject ) => {
+				context
+					.validateAll()
+					.then( ( errors ) => {
+						if ( isInvalid( errors ) ) {
+							reject( errors );
+						} else {
+							resolve();
+						}
+					} )
+					.catch( () => {
+						reject( context.errors );
+					} );
+			} ).finally( () => {
+				setIsValidating( false );
+			} );
+		},
+	};
+}
diff --git a/packages/js/product-editor/src/contexts/validation-context/validation-context.ts b/packages/js/product-editor/src/contexts/validation-context/validation-context.ts
new file mode 100644
index 00000000000..750e1610a70
--- /dev/null
+++ b/packages/js/product-editor/src/contexts/validation-context/validation-context.ts
@@ -0,0 +1,19 @@
+/**
+ * External dependencies
+ */
+import { createContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { ValidationContextProps } from './types';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const ValidationContext = createContext< ValidationContextProps< any > >(
+	{
+		errors: {},
+		registerValidator: () => () => {},
+		validateField: () => Promise.resolve( undefined ),
+		validateAll: () => Promise.resolve( {} ),
+	}
+);
diff --git a/packages/js/product-editor/src/contexts/validation-context/validation-provider.tsx b/packages/js/product-editor/src/contexts/validation-context/validation-provider.tsx
new file mode 100644
index 00000000000..c700e269f5e
--- /dev/null
+++ b/packages/js/product-editor/src/contexts/validation-context/validation-provider.tsx
@@ -0,0 +1,91 @@
+/**
+ * External dependencies
+ */
+import { createElement, useRef, useState } from '@wordpress/element';
+import { PropsWithChildren } from 'react';
+
+/**
+ * Internal dependencies
+ */
+import {
+	ValidationErrors,
+	ValidationProviderProps,
+	Validator,
+	ValidatorResponse,
+} from './types';
+import { ValidationContext } from './validation-context';
+import { findFirstInvalidElement } from './helpers';
+
+export function ValidationProvider< T >( {
+	initialValue,
+	children,
+}: PropsWithChildren< ValidationProviderProps< T > > ) {
+	const validatorsRef = useRef< Record< string, Validator< T > > >( {} );
+	const fieldRefs = useRef< Record< string, HTMLElement > >( {} );
+	const [ errors, setErrors ] = useState< ValidationErrors >( {} );
+
+	function registerValidator(
+		validatorId: string,
+		validator: Validator< T >
+	): React.Ref< HTMLElement > {
+		validatorsRef.current = {
+			...validatorsRef.current,
+			[ validatorId ]: validator,
+		};
+
+		return ( element: HTMLElement ) => {
+			fieldRefs.current[ validatorId ] = element;
+		};
+	}
+
+	async function validateField( validatorId: string ): ValidatorResponse {
+		const validators = validatorsRef.current;
+		if ( validatorId in validators ) {
+			const validator = validators[ validatorId ];
+			const result = validator( initialValue );
+
+			return result.then( ( error ) => {
+				setErrors( ( currentErrors ) => ( {
+					...currentErrors,
+					[ validatorId ]: error,
+				} ) );
+				return error;
+			} );
+		}
+
+		return Promise.resolve( undefined );
+	}
+
+	async function validateAll(): Promise< ValidationErrors > {
+		const newErrors: ValidationErrors = {};
+		const validators = validatorsRef.current;
+
+		for ( const validatorId in validators ) {
+			newErrors[ validatorId ] = await validateField( validatorId );
+		}
+
+		setErrors( newErrors );
+
+		const firstElementWithError = findFirstInvalidElement(
+			fieldRefs.current,
+			newErrors
+		);
+
+		firstElementWithError?.focus();
+
+		return newErrors;
+	}
+
+	return (
+		<ValidationContext.Provider
+			value={ {
+				errors,
+				registerValidator,
+				validateField,
+				validateAll,
+			} }
+		>
+			{ children }
+		</ValidationContext.Provider>
+	);
+}
diff --git a/packages/js/product-editor/src/hooks/index.ts b/packages/js/product-editor/src/hooks/index.ts
index 646b526a553..e1ac9e9b7fc 100644
--- a/packages/js/product-editor/src/hooks/index.ts
+++ b/packages/js/product-editor/src/hooks/index.ts
@@ -2,7 +2,3 @@ export { useProductHelper as __experimentalUseProductHelper } from './use-produc
 export { useProductMVPCESFooter as __experimentalUseProductMVPCESFooter } from './use-product-mvp-ces-footer';
 export { useVariationsOrder as __experimentalUseVariationsOrder } from './use-variations-order';
 export { useCurrencyInputProps as __experimentalUseCurrencyInputProps } from './use-currency-input-props';
-export {
-	useValidation as __experimentalUseValidation,
-	ValidationError,
-} from './use-validation';
diff --git a/packages/js/product-editor/src/hooks/use-currency-input-props.ts b/packages/js/product-editor/src/hooks/use-currency-input-props.ts
index da6b53d573a..f92e141bae7 100644
--- a/packages/js/product-editor/src/hooks/use-currency-input-props.ts
+++ b/packages/js/product-editor/src/hooks/use-currency-input-props.ts
@@ -8,37 +8,45 @@ import { useContext } from '@wordpress/element';
  * Internal dependencies
  */
 import { useProductHelper } from './use-product-helper';
+import { formatCurrencyDisplayValue } from '../utils';
 
 export type CurrencyInputProps = {
 	prefix: string;
 	className: string;
+	value: string;
 	sanitize: ( value: string | number ) => string;
+	onChange: ( value: string ) => void;
 	onFocus: ( event: React.FocusEvent< HTMLInputElement > ) => void;
 	onKeyUp: ( event: React.KeyboardEvent< HTMLInputElement > ) => void;
 };
 
 type Props = {
 	value: string;
-	setValue: ( value: string ) => void;
+	onChange: ( value: string ) => void;
 	onFocus?: ( event: React.FocusEvent< HTMLInputElement > ) => void;
 	onKeyUp?: ( event: React.KeyboardEvent< HTMLInputElement > ) => void;
 };
 
 export const useCurrencyInputProps = ( {
 	value,
-	setValue,
+	onChange,
 	onFocus,
 	onKeyUp,
 }: Props ) => {
 	const { sanitizePrice } = useProductHelper();
 
 	const context = useContext( CurrencyContext );
-	const { getCurrencyConfig } = context;
+	const { getCurrencyConfig, formatAmount } = context;
 	const currencyConfig = getCurrencyConfig();
 
 	const currencyInputProps: CurrencyInputProps = {
 		prefix: currencyConfig.symbol,
-		className: 'half-width-field components-currency-control',
+		className: 'components-currency-control',
+		value: formatCurrencyDisplayValue(
+			String( value ),
+			currencyConfig,
+			formatAmount
+		),
 		sanitize: ( val: string | number ) => {
 			return sanitizePrice( String( val ) );
 		},
@@ -63,15 +71,21 @@ export const useCurrencyInputProps = ( {
 			const amount = Number.parseFloat( sanitizePrice( value || '0' ) );
 			const step = Number( event.currentTarget.step || '1' );
 			if ( event.code === 'ArrowUp' ) {
-				setValue( String( amount + step ) );
+				onChange( String( amount + step ) );
 			}
 			if ( event.code === 'ArrowDown' ) {
-				setValue( String( amount - step ) );
+				onChange( String( amount - step ) );
 			}
 			if ( onKeyUp ) {
 				onKeyUp( event );
 			}
 		},
+		onChange( newValue: string ) {
+			const sanitizeValue = sanitizePrice( newValue || '0' );
+			if ( onChange ) {
+				onChange( sanitizeValue );
+			}
+		},
 	};
 	return currencyInputProps;
 };
diff --git a/packages/js/product-editor/src/hooks/use-validation/README.md b/packages/js/product-editor/src/hooks/use-validation/README.md
deleted file mode 100644
index 611f528792c..00000000000
--- a/packages/js/product-editor/src/hooks/use-validation/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# useValidation
-
-This custom hook uses the helper functions `const { lockPostSaving, unlockPostSaving } = useDispatch( 'core/editor' );` to lock/unlock the current editing product before saving it.
-
-## Usage
-
-Syncronous validation
-
-```typescript
-import { useCallback } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import {
-	__experimentalUseValidation as useValidation,
-	ValidationError
-} from '@woocommerce/product-editor';
-
-const product = ...;
-
-const validateTitle = useCallback( (): ValidationError => {
-	if ( product.title.length < 2 ) {
-		return __( 'Title must be more than 1 character', 'text-domain' );
-	}
-}, [ product.title ] );
-
-const validationError = useValidation( 'product/title', validateTitle );
-```
-
-Asyncronous validation
-
-```typescript
-import { useCallback } from '@wordpress/element';
-import {
-	__experimentalUseValidation as useValidation,
-	ValidationError
-} from '@woocommerce/product-editor';
-
-const product = ...;
-
-const validateSlug = useCallback( async (): Promise< ValidationError > => {
-	return fetch( `.../validate-slug?slug=${ product.slug }` )
-		.then( ( response ) => response.json() )
-		.then( ( { errorMessage } ) => errorMessage );
-}, [ product.slug ] );
-
-const validationError = useValidation( 'product/slug', validateSlug );
-```
diff --git a/packages/js/product-editor/src/hooks/use-validation/index.ts b/packages/js/product-editor/src/hooks/use-validation/index.ts
deleted file mode 100644
index f7a6938360a..00000000000
--- a/packages/js/product-editor/src/hooks/use-validation/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './use-validation';
-export * from './types';
diff --git a/packages/js/product-editor/src/hooks/use-validation/test/use-validation.test.ts b/packages/js/product-editor/src/hooks/use-validation/test/use-validation.test.ts
deleted file mode 100644
index e9e3761865e..00000000000
--- a/packages/js/product-editor/src/hooks/use-validation/test/use-validation.test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * External dependencies
- */
-import {
-	RenderHookResult,
-	act,
-	renderHook,
-} from '@testing-library/react-hooks';
-import { useDispatch } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { useValidation } from '../use-validation';
-import { ValidationError } from '../types';
-
-jest.mock( '@wordpress/data', () => ( {
-	useDispatch: jest.fn(),
-} ) );
-
-describe( 'useValidation', () => {
-	const useDispatchMock = useDispatch as jest.Mock;
-	const lockPostSaving = jest.fn();
-	const unlockPostSaving = jest.fn();
-	let hookResult = {} as RenderHookResult< unknown, ValidationError >;
-
-	beforeEach( () => {
-		useDispatchMock.mockReturnValue( {
-			lockPostSaving,
-			unlockPostSaving,
-		} );
-	} );
-
-	afterEach( async () => {
-		jest.clearAllMocks();
-	} );
-
-	describe( 'sync', () => {
-		it( 'should lock the editor if validate returns an error', async () => {
-			const validationError = 'Invalid name';
-
-			await act( async () => {
-				hookResult = renderHook( () =>
-					useValidation( 'product/name', () => validationError )
-				);
-			} );
-
-			const { result } = hookResult;
-
-			expect( result.current ).toBe( validationError );
-			expect( lockPostSaving ).toHaveBeenCalled();
-			expect( unlockPostSaving ).not.toHaveBeenCalled();
-		} );
-
-		it( 'should unlock the editor if validate returns no error', async () => {
-			await act( async () => {
-				hookResult = renderHook( () =>
-					useValidation( 'product/name', () => undefined )
-				);
-			} );
-
-			const { result } = hookResult;
-
-			expect( result.current ).toBeUndefined();
-			expect( lockPostSaving ).not.toHaveBeenCalled();
-			expect( unlockPostSaving ).toHaveBeenCalled();
-		} );
-	} );
-
-	describe( 'async', () => {
-		it( 'should lock the editor if validate resolves an error', async () => {
-			const validationError = 'Invalid name';
-
-			await act( async () => {
-				hookResult = renderHook( () =>
-					useValidation( 'product/name', () =>
-						Promise.resolve( validationError )
-					)
-				);
-			} );
-
-			const { result } = hookResult;
-
-			expect( result.current ).toBe( validationError );
-			expect( lockPostSaving ).toHaveBeenCalled();
-			expect( unlockPostSaving ).not.toHaveBeenCalled();
-		} );
-
-		it( 'should lock the editor if validate rejects', async () => {
-			const validationError = 'Invalid name';
-
-			await act( async () => {
-				hookResult = renderHook( () =>
-					useValidation( 'product/name', () =>
-						Promise.reject( validationError )
-					)
-				);
-			} );
-
-			const { result } = hookResult;
-
-			expect( result.current ).toBe( validationError );
-			expect( lockPostSaving ).toHaveBeenCalled();
-			expect( unlockPostSaving ).not.toHaveBeenCalled();
-		} );
-
-		it( 'should unlock the editor if validate resolves undefined', async () => {
-			await act( async () => {
-				hookResult = renderHook( () =>
-					useValidation( 'product/name', () =>
-						Promise.resolve( undefined )
-					)
-				);
-			} );
-
-			const { result } = hookResult;
-
-			expect( result.current ).toBeUndefined();
-			expect( lockPostSaving ).not.toHaveBeenCalled();
-			expect( unlockPostSaving ).toHaveBeenCalled();
-		} );
-	} );
-} );
diff --git a/packages/js/product-editor/src/hooks/use-validation/types.ts b/packages/js/product-editor/src/hooks/use-validation/types.ts
deleted file mode 100644
index 4e62d30b92d..00000000000
--- a/packages/js/product-editor/src/hooks/use-validation/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ValidationError = undefined | string | Error;
diff --git a/packages/js/product-editor/src/hooks/use-validation/use-validation.ts b/packages/js/product-editor/src/hooks/use-validation/use-validation.ts
deleted file mode 100644
index b95ddc08d14..00000000000
--- a/packages/js/product-editor/src/hooks/use-validation/use-validation.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * External dependencies
- */
-import { useDispatch } from '@wordpress/data';
-import { useEffect, useState } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { ValidationError } from './types';
-
-/**
- * Signals that product saving is locked.
- *
- * @param  lockName The namespace used to lock the product saving if validation fails.
- * @param  validate The validator function.
- * @return The error message.
- */
-export function useValidation(
-	lockName: string,
-	validate: () => ValidationError | Promise< ValidationError >
-): ValidationError {
-	const [ validationError, setValidationError ] =
-		useState< ValidationError >();
-	const { lockPostSaving, unlockPostSaving } = useDispatch( 'core/editor' );
-
-	useEffect( () => {
-		let validationResponse = validate();
-
-		if ( ! ( validationResponse instanceof Promise ) ) {
-			validationResponse = Promise.resolve( validationResponse );
-		}
-
-		validationResponse
-			.then( ( message ) => {
-				if ( message ) {
-					lockPostSaving( lockName );
-				} else {
-					unlockPostSaving( lockName );
-				}
-				setValidationError( message );
-			} )
-			.catch( ( error ) => {
-				lockPostSaving( lockName );
-				setValidationError( error.message ?? error );
-			} );
-	}, [ lockName, validate, lockPostSaving, unlockPostSaving ] );
-
-	return validationError;
-}
diff --git a/packages/js/product-editor/src/index.ts b/packages/js/product-editor/src/index.ts
index c62b84726c4..6f5473d7367 100644
--- a/packages/js/product-editor/src/index.ts
+++ b/packages/js/product-editor/src/index.ts
@@ -14,3 +14,5 @@ export * from './utils';
  * Hooks
  */
 export * from './hooks';
+export { useValidation, useValidations } from './contexts/validation-context';
+export * from './contexts/validation-context/types';
diff --git a/packages/js/product-editor/src/utils/get-product-error-message.ts b/packages/js/product-editor/src/utils/get-product-error-message.ts
new file mode 100644
index 00000000000..4d14e3ebef7
--- /dev/null
+++ b/packages/js/product-editor/src/utils/get-product-error-message.ts
@@ -0,0 +1,20 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+export type WPError = {
+	code: string;
+	message: string;
+	data: {
+		[ key: string ]: unknown;
+	};
+};
+
+export function getProductErrorMessage( error: WPError ) {
+	if ( error.code === 'product_invalid_sku' ) {
+		return __( 'Invalid or duplicated SKU.', 'woocommerce' );
+	}
+
+	return null;
+}
diff --git a/packages/js/product-editor/src/utils/test/get-product-error-message.ts b/packages/js/product-editor/src/utils/test/get-product-error-message.ts
new file mode 100644
index 00000000000..34348578787
--- /dev/null
+++ b/packages/js/product-editor/src/utils/test/get-product-error-message.ts
@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import { getProductErrorMessage, WPError } from '../get-product-error-message';
+
+describe( 'getProductErrorMessage', () => {
+	it( 'should return the correct error message when one exists', () => {
+		const error = {
+			code: 'product_invalid_sku',
+		} as WPError;
+		const message = getProductErrorMessage( error );
+		expect( message ).toBe( 'Invalid or duplicated SKU.' );
+	} );
+
+	it( 'should return null when no error message exists', () => {
+		const error = {
+			code: 'unanticipated_error_code',
+		} as WPError;
+		const status = getProductErrorMessage( error );
+		expect( status ).toBeNull();
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/activity-panel/activity-panel.js b/plugins/woocommerce-admin/client/activity-panel/activity-panel.js
index d67c1d9504b..ccc4bc0d1d5 100644
--- a/plugins/woocommerce-admin/client/activity-panel/activity-panel.js
+++ b/plugins/woocommerce-admin/client/activity-panel/activity-panel.js
@@ -28,7 +28,7 @@ import {
  */
 import './style.scss';
 import { IconFlag } from './icon-flag';
-import { isNotesPanelVisible } from './unread-indicators';
+import { hasUnreadNotes as checkIfHasUnreadNotes } from './unread-indicators';
 import { Tabs } from './tabs';
 import { SetupProgress } from './setup-progress';
 import { DisplayOptions } from './display-options';
@@ -43,7 +43,7 @@ import { getUnapprovedReviews } from '../homescreen/activity-panel/reviews/utils
 import { ABBREVIATED_NOTIFICATION_SLOT_NAME } from './panels/inbox/abbreviated-notifications-panel';
 import { getAdminSetting } from '~/utils/admin-settings';
 import { getUrlParams } from '~/utils';
-import { useActiveSetupTasklist } from '~/tasks';
+import { useActiveSetupTasklist } from '~/task-lists';
 import { getSegmentsFromPath } from '~/utils/url-helpers';
 import { FeedbackIcon } from '~/products/images/feedback-icon';
 import { ProductFeedbackTour } from '~/guided-tours/add-product-feedback-tour';
@@ -121,25 +121,22 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
 		).length;
 	}
 
-	function isAbbreviatedPanelVisible(
+	function checkIfHasAbbreviatedNotifications(
 		select,
 		setupTaskListHidden,
 		thingsToDoNextCount
 	) {
 		const orderStatuses = getOrderStatuses( select );
 
-		const isOrdersCardVisible =
-			setupTaskListHidden && isPanelOpen
-				? getUnreadOrders( select, orderStatuses ) > 0
-				: false;
-		const isReviewsCardVisible =
-			setupTaskListHidden && isPanelOpen
-				? getUnapprovedReviews( select )
-				: false;
-		const isLowStockCardVisible =
-			setupTaskListHidden && isPanelOpen
-				? getLowStockProducts( select )
-				: false;
+		const isOrdersCardVisible = setupTaskListHidden
+			? getUnreadOrders( select, orderStatuses ) > 0
+			: false;
+		const isReviewsCardVisible = setupTaskListHidden
+			? getUnapprovedReviews( select )
+			: false;
+		const isLowStockCardVisible = setupTaskListHidden
+			? getLowStockProducts( select )
+			: false;
 
 		return (
 			thingsToDoNextCount > 0 ||
@@ -176,8 +173,8 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
 		const thingsToDoCount = getThingsToDoNextCount( extendedTaskList );
 
 		return {
-			hasUnreadNotes: isNotesPanelVisible( select ),
-			hasAbbreviatedNotifications: isAbbreviatedPanelVisible(
+			hasUnreadNotes: checkIfHasUnreadNotes( select ),
+			hasAbbreviatedNotifications: checkIfHasAbbreviatedNotifications(
 				select,
 				isSetupTaskListHidden,
 				thingsToDoCount
diff --git a/plugins/woocommerce-admin/client/activity-panel/panels/help.js b/plugins/woocommerce-admin/client/activity-panel/panels/help.js
index 00a94cac886..2f1df913eb4 100644
--- a/plugins/woocommerce-admin/client/activity-panel/panels/help.js
+++ b/plugins/woocommerce-admin/client/activity-panel/panels/help.js
@@ -145,7 +145,7 @@ function getPaymentGatewaySuggestions( props ) {
 			link: 'https://woocommerce.com/document/klarna-payments/?utm_source=help_panel&utm_medium=product',
 		},
 		paymentGatewaySuggestions.payfast && {
-			title: __( 'PayFast Setup and Configuration', 'woocommerce' ),
+			title: __( 'Payfast Setup and Configuration', 'woocommerce' ),
 			link: 'https://woocommerce.com/document/payfast-payment-gateway/?utm_source=help_panel&utm_medium=product',
 		},
 		paymentGatewaySuggestions.eway && {
diff --git a/plugins/woocommerce-admin/client/activity-panel/panels/setup-tasks/setup-tasks-panel.tsx b/plugins/woocommerce-admin/client/activity-panel/panels/setup-tasks/setup-tasks-panel.tsx
index 492e8759ee4..66451648c87 100644
--- a/plugins/woocommerce-admin/client/activity-panel/panels/setup-tasks/setup-tasks-panel.tsx
+++ b/plugins/woocommerce-admin/client/activity-panel/panels/setup-tasks/setup-tasks-panel.tsx
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { Tasks } from '~/tasks';
+import { TaskLists } from '~/task-lists';
 
 type QueryTypeProps = {
 	query: {
@@ -12,7 +12,7 @@ type QueryTypeProps = {
 export const SetupTasksPanel = ( { query }: QueryTypeProps ) => {
 	return (
 		<div className="woocommerce-setup-panel">
-			<Tasks query={ query } />
+			<TaskLists query={ query } />
 		</div>
 	);
 };
diff --git a/plugins/woocommerce-admin/client/activity-panel/test/help-panel.js b/plugins/woocommerce-admin/client/activity-panel/test/help-panel.js
index 987bf25de49..c12f1326ee5 100644
--- a/plugins/woocommerce-admin/client/activity-panel/test/help-panel.js
+++ b/plugins/woocommerce-admin/client/activity-panel/test/help-panel.js
@@ -39,7 +39,7 @@ describe( 'Activity Panels', () => {
 				},
 				{
 					id: 'payfast',
-					text: 'PayFast',
+					text: 'Payfast',
 				},
 				{
 					id: 'eway',
diff --git a/plugins/woocommerce-admin/client/activity-panel/test/index.js b/plugins/woocommerce-admin/client/activity-panel/test/index.js
index 891a575fcd7..b63524bb4e3 100644
--- a/plugins/woocommerce-admin/client/activity-panel/test/index.js
+++ b/plugins/woocommerce-admin/client/activity-panel/test/index.js
@@ -219,7 +219,7 @@ describe( 'Activity Panel', () => {
 		expect( getByText( 'Finish setup' ) ).toBeInTheDocument();
 	} );
 
-	it( 'should not render the finish setup link when a user does not have capabilties', () => {
+	it( 'should not render the finish setup link when a user does not have capabilities', () => {
 		useUser.mockImplementation( () => ( {
 			currentUserCan: () => false,
 		} ) );
diff --git a/plugins/woocommerce-admin/client/activity-panel/unread-indicators.js b/plugins/woocommerce-admin/client/activity-panel/unread-indicators.js
index 96ec7d61722..1e5e76f837f 100644
--- a/plugins/woocommerce-admin/client/activity-panel/unread-indicators.js
+++ b/plugins/woocommerce-admin/client/activity-panel/unread-indicators.js
@@ -22,7 +22,7 @@ const UNREAD_NOTES_QUERY = {
 	order: 'desc',
 };
 
-export function isNotesPanelVisible( select ) {
+export function hasUnreadNotes( select ) {
 	const { getNotes, getNotesError, isResolving } = select( NOTES_STORE_NAME );
 
 	const { getCurrentUser } = select( USER_STORE_NAME );
diff --git a/plugins/woocommerce-admin/client/analytics/components/report-filters/index.js b/plugins/woocommerce-admin/client/analytics/components/report-filters/index.js
index c2313f1b4a6..03ff9dad74a 100644
--- a/plugins/woocommerce-admin/client/analytics/components/report-filters/index.js
+++ b/plugins/woocommerce-admin/client/analytics/components/report-filters/index.js
@@ -45,7 +45,7 @@ class ReportFilters extends Component {
 		// This event gets triggered in the following cases.
 		// 1. Select "Single product" and choose a product.
 		// 2. Select "Comparison" or any other filter types.
-		// The comparsion and other filter types require a user to click
+		// The comparison and other filter types require a user to click
 		// a button to execute a query, so this is not a good place to
 		// trigger a CES survey for those.
 		const triggerCesFor = [
diff --git a/plugins/woocommerce-admin/client/analytics/components/report-filters/test/index.js b/plugins/woocommerce-admin/client/analytics/components/report-filters/test/index.js
new file mode 100644
index 00000000000..cf31e44ddf6
--- /dev/null
+++ b/plugins/woocommerce-admin/client/analytics/components/report-filters/test/index.js
@@ -0,0 +1,50 @@
+/**
+ * External dependencies
+ */
+import { render } from '@testing-library/react';
+import { recordEvent } from '@woocommerce/tracks';
+
+import userEvent from '@testing-library/user-event';
+
+/**
+ * Internal dependencies
+ */
+import ReportFilters from '..';
+
+describe( 'ReportFilters', () => {
+	test( 'should record analytics_filter Tracks event when filter is changed', async () => {
+		const { getByText } = render(
+			<ReportFilters
+				report="test-report"
+				query={ {
+					page: 'page',
+					path: 'path',
+				} }
+				filters={ [
+					{
+						filters: [
+							{
+								label: 'All products',
+								value: 'all',
+							},
+							{
+								label: 'Some products',
+								value: 'some',
+							},
+						],
+						label: 'Show',
+						param: 'filter',
+						showFilters: () => true,
+						staticParams: [],
+					},
+				] }
+			/>
+		);
+		userEvent.click( getByText( 'All products' ) );
+		userEvent.click( getByText( 'Some products' ) );
+		expect( recordEvent ).toHaveBeenCalledWith( 'analytics_filter', {
+			filter: 'some',
+			report: 'test-report',
+		} );
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/analytics/components/report-table/index.js b/plugins/woocommerce-admin/client/analytics/components/report-table/index.js
index 22b5dbe4803..89f020645ce 100644
--- a/plugins/woocommerce-admin/client/analytics/components/report-table/index.js
+++ b/plugins/woocommerce-admin/client/analytics/components/report-table/index.js
@@ -138,7 +138,7 @@ const ReportTable = ( props ) => {
 	};
 
 	const filterShownHeaders = ( headers, hiddenKeys ) => {
-		// If no user preferences, set visibilty based on column default.
+		// If no user preferences, set visibility based on column default.
 		if ( ! hiddenKeys ) {
 			return headers.map( ( header ) => ( {
 				...header,
@@ -146,7 +146,7 @@ const ReportTable = ( props ) => {
 			} ) );
 		}
 
-		// Set visibilty based on user preferences.
+		// Set visibility based on user preferences.
 		return headers.map( ( header ) => ( {
 			...header,
 			visible: header.required || ! hiddenKeys.includes( header.key ),
diff --git a/plugins/woocommerce-admin/client/analytics/report/README.md b/plugins/woocommerce-admin/client/analytics/report/README.md
index 21ddb7163db..fd7261eada2 100644
--- a/plugins/woocommerce-admin/client/analytics/report/README.md
+++ b/plugins/woocommerce-admin/client/analytics/report/README.md
@@ -24,7 +24,7 @@ Each menu item is defined by an array containing `id`, `title`, `parent`, and `p
 
 -   `report` (string): The report's id.
 -   `title` (string): The title shown in the sidebar.
--   `parent` (string): The item's parent in the navigational heirarchy.
+-   `parent` (string): The item's parent in the navigational hierarchy.
 -   `path` (string): The report's relative path.
 
 Next, hook into the JavaScript reports filter, `woocommerce_admin_reports_list`, to add a report component.
diff --git a/plugins/woocommerce-admin/client/analytics/report/revenue/table.js b/plugins/woocommerce-admin/client/analytics/report/revenue/table.js
index 8f50ffd6fd5..dd8596811b7 100644
--- a/plugins/woocommerce-admin/client/analytics/report/revenue/table.js
+++ b/plugins/woocommerce-admin/client/analytics/report/revenue/table.js
@@ -20,7 +20,6 @@ import {
 	defaultTableDateFormat,
 	getCurrentDates,
 } from '@woocommerce/date';
-import { stringify } from 'qs';
 import { CurrencyContext } from '@woocommerce/currency';
 
 /**
@@ -308,7 +307,7 @@ const formatProps = memoize(
 		[
 			isError,
 			isRequesting,
-			stringify( tableQuery ),
+			new URLSearchParams( tableQuery ).toString(),
 			get( revenueData, [ 'totalResults' ], 0 ),
 			get( revenueData, [ 'data', 'intervals' ], EMPTY_ARRAY ).length,
 		].join( ':' )
diff --git a/plugins/woocommerce-admin/client/analytics/settings/README.md b/plugins/woocommerce-admin/client/analytics/settings/README.md
index ddc4f7d6a53..aab2d248178 100644
--- a/plugins/woocommerce-admin/client/analytics/settings/README.md
+++ b/plugins/woocommerce-admin/client/analytics/settings/README.md
@@ -1,7 +1,7 @@
 Settings
 =======
 
-The settings used to modify the way data is retreived or displayed in WooCommerce reports.
+The settings used to modify the way data is retrieved or displayed in WooCommerce reports.
 
 ## Extending Settings
 
diff --git a/plugins/woocommerce-admin/client/analytics/settings/default-date.js b/plugins/woocommerce-admin/client/analytics/settings/default-date.js
index d5737e18648..22c1f99909d 100644
--- a/plugins/woocommerce-admin/client/analytics/settings/default-date.js
+++ b/plugins/woocommerce-admin/client/analytics/settings/default-date.js
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import { parse, stringify } from 'qs';
 import { DateRangeFilterPicker } from '@woocommerce/components';
 import { useSettings } from '@woocommerce/data';
 import {
@@ -20,11 +19,13 @@ const DefaultDate = ( { value, onChange } ) => {
 		onChange( {
 			target: {
 				name: 'woocommerce_default_date_range',
-				value: stringify( query ),
+				value: new URLSearchParams( query ).toString(),
 			},
 		} );
 	};
-	const query = parse( value.replace( /&amp;/g, '&' ) );
+	const query = Object.fromEntries(
+		new URLSearchParams( value.replace( /&amp;/g, '&' ) )
+	);
 	const { period, compare, before, after } = getDateParamsFromQuery(
 		query,
 		defaultDateRange
diff --git a/plugins/woocommerce-admin/client/core-profiler/assets/images/loader-lightbulb.svg b/plugins/woocommerce-admin/client/core-profiler/assets/images/loader-lightbulb.svg
new file mode 100644
index 00000000000..9f8ba0da22a
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/assets/images/loader-lightbulb.svg
@@ -0,0 +1,36 @@
+<svg width="216" height="140" viewBox="0 0 216 140" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_947_7778)">
+<rect width="216" height="140" fill="white"/>
+<path d="M177.064 50.0078C155.982 50.0078 142.329 61.0748 142.329 78.0848C142.329 99.2878 164.804 102.165 164.804 113.214H189.324C189.324 102.161 211.799 99.2878 211.799 78.0848C211.799 61.0748 198.143 50.0078 177.064 50.0078Z" fill="#BEA0F2"/>
+<path d="M39.0797 4.22656C14.2064 4.22656 0.234706 23.4241 5.19535 37.8686C10.6041 53.6466 27.317 60.8426 27.317 81.5836H50.8494C50.8494 60.8426 67.5588 53.6466 72.971 37.8686C77.9282 23.4241 63.9565 4.22656 39.0797 4.22656Z" fill="#BEA0F2"/>
+<path d="M50.0127 48.273C44.2609 48.273 40.8791 52.067 40.8791 57.933V58.661C40.473 58.661 40.0529 58.661 39.6538 58.6645H38.8907C38.3095 58.6645 37.9629 58.6645 37.2838 58.6645V57.9365C37.2838 52.067 33.902 48.273 28.1502 48.273C23.0285 48.273 20.0913 50.205 20.0913 53.565C20.0913 56.0885 22.5489 57.793 27.3975 58.633C30.3627 59.1475 33.2369 59.2735 36.076 59.3015V81.5825H37.2838V59.305C37.9629 59.3085 38.306 59.3085 38.8907 59.305C39.4718 59.305 40.2 59.305 40.8791 59.305V81.579H42.0869V59.298C44.9261 59.27 47.8002 59.144 50.7654 58.6295C55.614 57.7895 58.0716 56.085 58.0716 53.5615C58.0716 50.198 55.1344 48.2695 50.0127 48.2695V48.273ZM36.0795 58.654C33.2684 58.6225 30.4327 58.5 27.52 57.996C23.0355 57.219 21.8207 55.3745 21.8207 53.453C21.8207 50.016 25.395 48.9205 28.1572 48.9205C33.2999 48.9205 36.083 52.459 36.083 57.933V58.6575L36.0795 58.654ZM50.6464 57.996C47.7302 58.5 44.8981 58.626 42.0869 58.654V57.9295C42.0869 52.4555 44.87 48.917 50.0127 48.917C52.7714 48.917 56.3457 50.0125 56.3457 53.4495C56.3457 55.371 55.1274 57.2155 50.6429 57.9925L50.6464 57.996Z" fill="white"/>
+<path d="M211.799 4.19922H154.12L148.435 51.8377L160.159 39.4757H207.483L211.799 4.19922Z" fill="#271B3D"/>
+<path d="M129.502 106.181C125.826 101.025 123.715 98.5508 119.567 98.5508C115.016 98.5508 113.017 103.703 115.751 106.923C118.758 110.465 129.555 114.161 129.555 114.161C129.555 114.161 105.801 111 99.6471 111C96.2513 111 92.7715 113.135 92.7715 117.188C92.7715 121.241 96.2513 123.376 99.6471 123.376C105.801 123.376 129.555 120.216 129.555 120.216C129.555 120.216 118.754 123.912 115.751 127.454C113.02 130.674 115.016 135.826 119.567 135.826C123.719 135.826 125.83 133.355 129.502 128.196C130.748 126.449 137.078 117.185 137.078 117.185C137.078 117.185 130.748 107.924 129.502 106.174V106.181Z" fill="#271B3D"/>
+<path d="M78.0678 85.0508L137.932 85.0508V67.5508H78.0678V85.0508Z" fill="#BEA0F2"/>
+<path d="M120.428 67.5508H78.0679V71.0508H120.428V67.5508Z" fill="#271B3D"/>
+<path d="M137.756 74.5859H78.2427V78.0859H137.756V74.5859Z" fill="#271B3D"/>
+<path d="M111.676 81.5508H78.0679V85.0508H111.676V81.5508Z" fill="#271B3D"/>
+<path d="M86.4699 98.3516H49.0112V135.802H86.4699V98.3516Z" fill="#BEA0F2"/>
+<path d="M70.4365 123.6L77.1651 117.398L56.3633 117.471V116.446L77.1441 116.516L70.44 110.338L71.0597 109.551L78.863 116.897V117.016L71.0597 124.387L70.44 123.6H70.4365Z" fill="#271B3D"/>
+<path d="M171.336 20.5877L175.548 32.7257L196.178 9.69922" stroke="white" stroke-miterlimit="10"/>
+<path d="M186.698 90.9335C186.698 84.784 183.015 80.9585 177.085 80.9375C177.085 80.9375 177.071 80.9375 177.064 80.9375C177.057 80.9375 177.05 80.9375 177.043 80.9375C171.113 80.9585 167.43 85.2705 167.43 90.9335C167.43 96.5965 170.913 99.288 175.881 102.83C172.873 105.637 171.263 110.078 171.263 113.211H173.791C173.791 110.306 174.347 106.186 177.064 103.75C179.784 106.186 180.337 110.306 180.337 113.211H182.865C182.865 110.078 181.251 105.633 178.247 102.83C183.215 99.288 186.698 96.2885 186.698 90.9335ZM177.064 102.162C172.138 98.6685 168.564 96.446 168.564 90.9335C168.564 85.421 171.96 81.9665 177.064 81.956C182.168 81.9665 185.564 85.6065 185.564 90.9335C185.564 95.711 181.99 98.6685 177.064 102.162Z" fill="#271B3D"/>
+<path d="M42.0099 127.4C42.0099 131.995 38.311 135.73 33.7224 135.8H12.6218C7.97364 135.803 4.20117 132.04 4.20117 127.4C4.20117 122.76 7.97014 119 12.6218 119H33.7329C38.3145 119 42.0064 122.812 42.0064 127.4H42.0099Z" fill="#BEA0F2"/>
+<path d="M33.4992 133.349C36.7861 133.349 39.4506 130.685 39.4506 127.399C39.4506 124.113 36.7861 121.449 33.4992 121.449C30.2124 121.449 27.5479 124.113 27.5479 127.399C27.5479 130.685 30.2124 133.349 33.4992 133.349Z" fill="#271B3D"/>
+<path d="M137.757 4.22656H78.2432V63.7266H137.757V4.22656Z" fill="#271B3D"/>
+<path d="M120.326 43.3729C120.326 39.2569 117.809 35.3159 112.87 32.6279H128.249L113.899 8.96094H102.105L87.7549 32.6279H103.134C98.1943 35.3159 95.6772 39.2569 95.6772 43.3729C95.6772 48.0314 99.3286 52.7319 104.142 55.2484C97.4836 53.9044 96.4404 58.9829 96.4404 58.9829H119.57C119.57 58.9829 118.527 53.9044 111.868 55.2484C116.682 52.7319 120.333 48.0314 120.333 43.3729H120.326Z" fill="white"/>
+<path d="M108 8.96484H102.105L87.7515 32.6283H103.131H112.87H128.249L113.896 8.96484H108Z" fill="#BEA0F2"/>
+<path d="M123.474 24.7578H92.5266L87.7515 32.6293L123.474 24.7578Z" fill="white"/>
+<path d="M118.698 16.8828H97.3015L92.5264 24.7578L118.698 16.8828Z" fill="white"/>
+<path d="M113.896 8.96484H102.105L97.3018 16.8818L113.896 8.96484Z" fill="white"/>
+<path d="M47.856 25.9769C57.1646 16.5059 65.6226 13.1144 75.1238 11.6094" stroke="#271B3D" stroke-miterlimit="10"/>
+<path d="M70.6288 29.4444L48.2026 11.3984" stroke="#271B3D" stroke-miterlimit="10"/>
+<path d="M57.1646 35.1382C60.2138 25.5832 61.327 13.2702 59.3631 4.22266" stroke="#271B3D" stroke-miterlimit="10"/>
+<path d="M21.9468 81.5859V85.0859H27.3135C27.3135 85.1314 27.3135 86.3459 27.3135 86.3879C27.394 92.1244 32.7538 97.2694 39.0797 97.2694C45.4057 97.2694 50.7549 92.1349 50.846 86.4019C50.846 86.3529 50.846 85.1349 50.846 85.0859H56.2127V81.5859H21.9468Z" fill="#271B3D"/>
+<path d="M193.844 116.715V113.215H160.281V116.715H164.801C164.801 116.97 164.801 117.572 164.801 118.325H160.281V121.825H164.801C164.801 122.917 164.801 123.795 164.801 123.82C164.801 129.406 169.551 135.828 177.064 135.828C184.577 135.828 189.327 129.402 189.327 123.82C189.327 123.792 189.327 122.938 189.327 121.825H193.847V118.325H189.327C189.327 117.572 189.327 116.974 189.327 116.715H193.844Z" fill="#271B3D"/>
+</g>
+<defs>
+<clipPath id="clip0_947_7778">
+<rect width="216" height="140" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/plugins/woocommerce-admin/client/core-profiler/components/choice/choice.scss b/plugins/woocommerce-admin/client/core-profiler/components/choice/choice.scss
new file mode 100644
index 00000000000..d918a0beddf
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/components/choice/choice.scss
@@ -0,0 +1,74 @@
+.woocommerce-profiler-choice-container {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	padding: $gap-large $gap;
+	border: 1px solid $gray-200;
+	border-radius: 2px;
+	width: 100%;
+	cursor: pointer;
+
+	&[data-selected] {
+		border: 2px solid var(--wp-admin-theme-color);
+		border-radius: 4px;
+	}
+
+	&:focus-visible {
+		border: 2px solid  var(--wp-admin-theme-color);
+		padding: $gap-large $gap;
+	}
+}
+
+.woocommerce-profiler-choice {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+
+	.woocommerce-profiler-choice-input {
+		opacity: 0;
+		position: absolute;
+	}
+
+	label {
+		font-weight: 500;
+		font-size: 14px;
+		line-height: 20px;
+		color: $gray-900;
+		display: flex;
+		position: relative;
+	}
+
+	input + label::before {
+		content: '';
+		width: 20px;
+		height: 20px;
+		border: 1px solid $gray-600;
+		border-radius: 16px;
+		margin-right: $gap;
+		display: inline-block;
+	}
+
+	input[data-selected] + label::before {
+		border-color: var(--wp-admin-theme-color);
+	}
+
+	input[data-selected] + label::after {
+		background-color: var(--wp-admin-theme-color);
+		align-self: center;
+		border-radius: 50%;
+		content: '';
+		position: absolute;
+		width: 14px;
+		height: 14px;
+		left: 4px;
+	}
+}
+
+.woocommerce-profiler-choice-sub-options {
+	margin-top: $gap-large;
+	width: 100%;
+
+	> div {
+		width: 100%;
+	}
+}
diff --git a/plugins/woocommerce-admin/client/core-profiler/components/choice/choice.tsx b/plugins/woocommerce-admin/client/core-profiler/components/choice/choice.tsx
new file mode 100644
index 00000000000..2d37bb7c131
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/components/choice/choice.tsx
@@ -0,0 +1,75 @@
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+
+/**
+ * Internal dependencies
+ */
+import './choice.scss';
+
+type Props = {
+	className?: string;
+	selected: boolean;
+	title: string;
+	name: string;
+	value: string;
+	onChange: ( value: string ) => void;
+	subOptionsComponent?: React.ReactNode;
+};
+
+export const Choice = ( {
+	className,
+	selected,
+	title,
+	name,
+	value,
+	onChange,
+	subOptionsComponent = null,
+}: Props ) => {
+	const changeHandler = () => {
+		onChange( value );
+	};
+	const inputId = 'woocommerce-' + value.replace( /_/g, '-' );
+
+	return (
+		<div
+			role="radio"
+			className={ classNames(
+				'woocommerce-profiler-choice-container',
+				className
+			) }
+			onClick={ changeHandler }
+			onKeyDown={ ( e ) => {
+				if ( e.key === 'Enter' ) {
+					changeHandler();
+				}
+			} }
+			data-selected={ selected ? selected : null }
+			tabIndex={ 0 }
+		>
+			<div className="woocommerce-profiler-choice">
+				<input
+					className="woocommerce-profiler-choice-input"
+					id={ inputId }
+					name={ name }
+					type="radio"
+					value={ value }
+					checked={ !! selected }
+					onChange={ changeHandler }
+					data-selected={ selected ? selected : null }
+					// Stop the input from being focused when the parent div is clicked
+					tabIndex={ -1 }
+				></input>
+				<label htmlFor={ inputId } className="choice__title">
+					{ title }
+				</label>
+			</div>
+			{ selected && subOptionsComponent && (
+				<div className="woocommerce-profiler-choice-sub-options">
+					{ subOptionsComponent }
+				</div>
+			) }
+		</div>
+	);
+};
diff --git a/plugins/woocommerce-admin/client/core-profiler/components/heading/style.scss b/plugins/woocommerce-admin/client/core-profiler/components/heading/style.scss
index f93f0596e92..c1cf617130f 100644
--- a/plugins/woocommerce-admin/client/core-profiler/components/heading/style.scss
+++ b/plugins/woocommerce-admin/client/core-profiler/components/heading/style.scss
@@ -1,7 +1,11 @@
 .woocommerce-profiler-heading {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
 	margin-bottom: 48px;
-	width: 100%;
 	max-width: 550px;
+	width: 100%;
 
 	.woocommerce-profiler-heading__title {
 		font-style: normal;
@@ -11,6 +15,7 @@
 		text-align: center;
 		color: #000;
 		margin-bottom: 12px;
+		padding-top: 0;
 
 		@include breakpoint( '<782px' ) {
 			font-size: 28px;
@@ -30,4 +35,30 @@
 			color: $gray-800;
 		}
 	}
+
+	&.woocommerce-profiler__stepper-heading {
+		margin-top: 72px;
+
+		.woocommerce-profiler-heading__title {
+			margin-bottom: 0;
+		}
+		.woocommerce-profiler-heading__subtitle {
+			margin: 12px 0 0;
+		}
+
+		@media (max-width: #{ ($break-mobile) }) {
+			margin-top: 52px 0 40px;
+
+			.woocommerce-profiler-heading__title {
+				font-size: 32px;
+				line-height: 40px;
+				text-align: left;
+			}
+			.woocommerce-profiler-heading__subtitle {
+				text-align: left;
+				font-size: 16px;
+				color: $gray-700;
+			}
+		}
+	}
 }
diff --git a/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/multiple-selector.scss b/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/multiple-selector.scss
new file mode 100644
index 00000000000..1a3927cf485
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/multiple-selector.scss
@@ -0,0 +1,113 @@
+
+.woocommerce-experimental-select-control {
+	&:hover,
+	ul:hover,
+	.woocommerce-experimental-select-control__input:hover,
+	.components-popover:hover,
+	.woocommerce-experimental-select-control__combo-box-wrapper:hover {
+		cursor: pointer;
+	}
+
+	&.has-selected-items {
+		.woocommerce-experimental-select-control__combox-box {
+			position: absolute;
+			width: 0;
+			z-index: -1;
+		}
+	}
+
+	.woocommerce-experimental-select-control__combox-box .woocommerce-experimental-select-control__input {
+		font-size: 13px;
+		font-weight: 400;
+		line-height: 16px;
+	}
+
+	.components-popover.woocommerce-experimental-select-control__popover-menu {
+		padding-bottom: 20px;
+	}
+
+	.woocommerce-experimental-select-control__selected-item {
+		background: $gray-100;
+		padding: 2px 5px 2px 8px;
+	}
+
+	.woocommerce-tag .woocommerce-tag__text {
+		background: none !important;
+		font-size: 12px;
+		line-height: 16px;
+		padding: 0 2px;
+	}
+
+	.woocommerce-experimental-select-control__combo-box-wrapper {
+		transition: box-shadow 0.25s linear;
+		border: 1px solid #bbb;
+		border-radius: 2px;
+	}
+
+	.woocommerce-experimental-select-control__popover-menu {
+		border: none;
+		left: 0 !important;
+		width: 100%;
+	}
+
+	.woocommerce-experimental-select-control__popover-menu-container {
+		overflow-y: initial;
+		list-style: none;
+		padding: 0;
+		width: 100% !important;
+	}
+
+	.components-popover {
+		transform: none !important;
+
+		.components-popover__content {
+			transform: none;
+			width: 100%;
+			border: 1px solid #ccc;
+			box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
+			border-radius: 2px;
+			overflow-x: hidden !important;
+
+			ul li {
+				&:hover {
+					background-color: #eff2fd !important;
+					cursor: pointer;
+				}
+
+				.components-base-control__field {
+					margin-bottom: 0 !important;
+				}
+
+				.components-checkbox-control__label {
+					cursor: pointer;
+					font-size: 13px;
+					font-weight: normal !important;
+					pointer-events: none;
+				}
+
+				.components-checkbox-control__input-container {
+					border: 1px solid #757575;
+					border-radius: 2px;
+					height: 20px !important;
+					padding: 1px;
+					width: 20px !important;
+
+					.components-checkbox-control__input[type='checkbox'] {
+						border: none;
+						height: 16px !important;
+						width: 16px !important;
+						&:checked {
+							border-radius: 2px;
+						}
+					}
+
+					svg {
+						height: 20px;
+						top: -1px;
+						width: 22px;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/multiple-selector.tsx b/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/multiple-selector.tsx
new file mode 100644
index 00000000000..460621d4922
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/multiple-selector.tsx
@@ -0,0 +1,97 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	__experimentalSelectControl as SelectControl,
+	selectControlStateChangeTypes,
+} from '@woocommerce/components';
+
+/**
+ * Internal dependencies
+ */
+import { renderMenu } from './render-menu';
+import './multiple-selector.scss';
+
+type Props = {
+	options: Array< { label: string; value: string } >;
+	onSelect: (
+		selectedOptions: Array< { label: string; value: string } >
+	) => void;
+	selectedOptions?: Array< { label: string; value: string } >;
+	placeholder?: string;
+	onOpenClose?: ( isOpen: boolean ) => void;
+};
+
+export const MultipleSelector = ( {
+	options,
+	onSelect,
+	selectedOptions = [],
+	placeholder = __( 'Select platforms', 'woocommerce' ),
+	onOpenClose = () => {},
+}: Props ) => {
+	return (
+		<SelectControl
+			label=""
+			multiple
+			__experimentalOpenMenuOnFocus
+			readOnlyWhenClosed={ false }
+			items={ options }
+			getFilteredItems={ ( allItems ) => allItems }
+			selected={ selectedOptions }
+			inputProps={ {
+				'aria-readonly': true,
+				'aria-label': __(
+					'Use up and down arrow keys to navigate',
+					'woocommerce'
+				),
+			} }
+			onKeyDown={ ( e ) => {
+				if ( e.key.length <= 1 ) {
+					e.preventDefault();
+					return false;
+				}
+			} }
+			placeholder={ selectedOptions.length ? '' : placeholder }
+			stateReducer={ ( state, actionAndChanges ) => {
+				const { changes, type } = actionAndChanges;
+				switch ( type ) {
+					case selectControlStateChangeTypes.ControlledPropUpdatedSelectedItem:
+						return {
+							...changes,
+							inputValue: state.inputValue,
+						};
+					case selectControlStateChangeTypes.ItemClick:
+						return {
+							...changes,
+							isOpen: true,
+							inputValue: state.inputValue,
+							highlightedIndex: state.highlightedIndex,
+						};
+					default:
+						return changes;
+				}
+			} }
+			onSelect={ ( item ) => {
+				if ( ! item ) {
+					return;
+				}
+				const exist = selectedOptions.find(
+					( existingItem ) => existingItem.value === item.value
+				);
+				const updatedPlatforms = exist
+					? selectedOptions.filter(
+							( existingItem ) =>
+								existingItem.value !== item.value
+					  )
+					: [ ...selectedOptions, item ];
+				onSelect( updatedPlatforms );
+			} }
+			onRemove={ ( item ) =>
+				onSelect( selectedOptions.filter( ( i ) => i !== item ) )
+			}
+		>
+			{ renderMenu( { selectedOptions, onOpenClose } ) }
+		</SelectControl>
+	);
+};
diff --git a/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/render-menu.tsx b/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/render-menu.tsx
new file mode 100644
index 00000000000..4eb21be2f27
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/components/multiple-selector/render-menu.tsx
@@ -0,0 +1,62 @@
+/**
+ * External dependencies
+ */
+import { CheckboxControl } from '@wordpress/components';
+import { useEffect } from '@wordpress/element';
+import {
+	__experimentalSelectControlMenu as Menu,
+	__experimentalSelectControlMenuItem as MenuItem,
+} from '@woocommerce/components';
+import { ChildrenProps } from '@woocommerce/components/build-types/experimental-select-control/types';
+
+type Props = {
+	selectedOptions: Array< { label: string; value: string } >;
+	onOpenClose: ( isOpen: boolean ) => void;
+};
+
+export const renderMenu =
+	( { selectedOptions, onOpenClose }: Props ) =>
+	( {
+		items,
+		highlightedIndex,
+		isOpen,
+		getItemProps,
+		getMenuProps,
+	}: ChildrenProps< {
+		label: string;
+		value: string;
+	} > ) => {
+		useEffect( () => {
+			onOpenClose( isOpen );
+		}, [ isOpen ] );
+
+		return (
+			<Menu
+				isOpen={ isOpen }
+				getMenuProps={ getMenuProps }
+				scrollIntoViewOnOpen={ true }
+			>
+				{ items.map( ( item, menuIndex ) => {
+					const isSelected = selectedOptions.includes( item );
+					return (
+						<MenuItem
+							key={ `${ item.value }` }
+							index={ menuIndex }
+							item={ item }
+							getItemProps={ getItemProps }
+							isActive={ highlightedIndex === menuIndex }
+							activeStyle={ {
+								backgroundColor: '#f6f7f7',
+							} }
+						>
+							<CheckboxControl
+								onChange={ () => {} }
+								checked={ isSelected }
+								label={ item.label }
+							/>
+						</MenuItem>
+					);
+				} ) }
+			</Menu>
+		);
+	};
diff --git a/plugins/woocommerce-admin/client/core-profiler/get-loader-stage-meta.tsx b/plugins/woocommerce-admin/client/core-profiler/get-loader-stage-meta.tsx
new file mode 100644
index 00000000000..9d9679a3f4c
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/get-loader-stage-meta.tsx
@@ -0,0 +1,32 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import LightBulb from './assets/images/loader-lightbulb.svg';
+import { Stages } from './pages/Loader';
+
+export const getLoaderStageMeta = ( key: string ): Stages => {
+	switch ( key ) {
+		case 'default':
+		default:
+			return [
+				{
+					title: __( 'Turning on the lights', 'woocommerce' ),
+					image: <img src={ LightBulb } alt="loader-lightbulb" />,
+					paragraphs: [
+						{
+							label: __( '#FunWooFact: ', 'woocommerce' ),
+							text: __(
+								'The Woo team is made up of over 350 talented individuals, distributed across 30+ countries.',
+								'woocommerce'
+							),
+						},
+					],
+				},
+			];
+	}
+};
diff --git a/plugins/woocommerce-admin/client/core-profiler/index.tsx b/plugins/woocommerce-admin/client/core-profiler/index.tsx
index 296818fb02f..ecf48f28f24 100644
--- a/plugins/woocommerce-admin/client/core-profiler/index.tsx
+++ b/plugins/woocommerce-admin/client/core-profiler/index.tsx
@@ -1,11 +1,19 @@
 /**
  * External dependencies
  */
-import { createMachine, assign, DoneInvokeEvent, actions } from 'xstate';
+import { createMachine, assign, DoneInvokeEvent, actions, spawn } from 'xstate';
 import { useMachine } from '@xstate/react';
 import { useEffect, useMemo } from '@wordpress/element';
 import { resolveSelect, dispatch } from '@wordpress/data';
-import { ExtensionList, OPTIONS_STORE_NAME } from '@woocommerce/data';
+import { navigateTo, getNewPath } from '@woocommerce/navigation';
+import {
+	ExtensionList,
+	OPTIONS_STORE_NAME,
+	COUNTRIES_STORE_NAME,
+	Country,
+	ONBOARDING_STORE_NAME,
+	Extension,
+} from '@woocommerce/data';
 import { recordEvent } from '@woocommerce/tracks';
 import { getSetting } from '@woocommerce/settings';
 import { initializeExPlat } from '@woocommerce/explat';
@@ -14,9 +22,18 @@ import { initializeExPlat } from '@woocommerce/explat';
  * Internal dependencies
  */
 import { IntroOptIn } from './pages/IntroOptIn';
-import { UserProfile } from './pages/UserProfile';
+import {
+	UserProfile,
+	BusinessChoice,
+	SellingOnlineAnswer,
+	SellingPlatform,
+} from './pages/UserProfile';
 import { BusinessInfo } from './pages/BusinessInfo';
 import { BusinessLocation } from './pages/BusinessLocation';
+import { getCountryStateOptions } from './services/country';
+import { Loader } from './pages/Loader';
+import { Extensions } from './pages/Extensions';
+
 import './style.scss';
 
 // TODO: Typescript support can be improved, but for now lets write the types ourselves
@@ -64,43 +81,35 @@ export type ExtensionsEvent = {
 	};
 };
 
+// TODO: add types as we develop the pages
+export type OnboardingProfile = {
+	business_choice: BusinessChoice;
+	selling_online_answer: SellingOnlineAnswer | null;
+	selling_platforms: SellingPlatform[] | null;
+	skip?: boolean;
+};
+
 export type CoreProfilerStateMachineContext = {
 	optInDataSharing: boolean;
-	userProfile: { foo: { bar: 'qux' }; skipped: false } | { skipped: true };
+	userProfile: {
+		businessChoice?: BusinessChoice;
+		sellingOnlineAnswer?: SellingOnlineAnswer | null;
+		sellingPlatforms?: SellingPlatform[] | null;
+		skipped?: boolean;
+	};
 	geolocatedLocation: {
 		location: string;
 	};
 	extensionsAvailable: ExtensionList[ 'plugins' ] | [];
 	extensionsSelected: string[]; // extension slugs
 	businessInfo: { foo?: { bar: 'qux' }; location: string };
-};
-
-const Extensions = ( {
-	context,
-	sendEvent,
-}: {
-	context: CoreProfilerStateMachineContext;
-	sendEvent: ( payload: ExtensionsEvent ) => void;
-} ) => {
-	return (
-		// TOOD: we need to fetch the extensions list from the API as part of initializing the profiler
-		<>
-			<div>Extensions</div>
-			<div>{ context.extensionsAvailable }</div>
-			<button
-				onClick={ () =>
-					sendEvent( {
-						type: 'EXTENSIONS_COMPLETED',
-						payload: {
-							extensionsSelected: [ 'woocommerce-payments' ],
-						},
-					} )
-				}
-			>
-				Next
-			</button>
-		</>
-	);
+	countries: { [ key: string ]: string };
+	loader: {
+		progress?: number;
+		className?: string;
+		useStages?: string;
+		stageIndex?: number;
+	};
 };
 
 const getAllowTrackingOption = async () =>
@@ -115,6 +124,60 @@ const handleTrackingOption = assign( {
 	) => event.data !== 'no',
 } );
 
+/**
+ * Prefetch it so that @wp/data caches it and there won't be a loading delay when its used
+ */
+const preFetchGetCountries = assign( {
+	spawnGetCountriesRef: () =>
+		spawn(
+			resolveSelect( COUNTRIES_STORE_NAME ).getCountries(),
+			'core-profiler-prefetch-countries'
+		),
+} );
+
+const getCountries = async () =>
+	resolveSelect( COUNTRIES_STORE_NAME ).getCountries();
+
+const handleCountries = assign( {
+	countries: ( _context, event: DoneInvokeEvent< Country[] > ) => {
+		return getCountryStateOptions( event.data );
+	},
+} );
+
+const getOnboardingProfileOption = async () =>
+	resolveSelect( OPTIONS_STORE_NAME ).getOption(
+		'woocommerce_onboarding_profile'
+	);
+
+const handleOnboardingProfileOption = assign( {
+	userProfile: (
+		_context,
+		event: DoneInvokeEvent< OnboardingProfile | undefined >
+	) => {
+		if ( ! event.data ) {
+			return {};
+		}
+
+		const {
+			business_choice: businessChoice,
+			selling_online_answer: sellingOnlineAnswer,
+			selling_platforms: sellingPlatforms,
+			...rest
+		} = event.data;
+
+		return {
+			...rest,
+			businessChoice,
+			sellingOnlineAnswer,
+			sellingPlatforms,
+		};
+	},
+} );
+
+const redirectToWooHome = () => {
+	navigateTo( { url: getNewPath( {}, '/', {} ) } );
+};
+
 const recordTracksIntroCompleted = () => {
 	recordEvent( 'storeprofiler_step_complete', {
 		step: 'store_details',
@@ -133,6 +196,49 @@ const recordTracksIntroViewed = () => {
 	} );
 };
 
+const recordTracksUserProfileViewed = () => {
+	recordEvent( 'storeprofiler_step_view', {
+		step: 'user_profile',
+		wc_version: getSetting( 'wcVersion' ),
+	} );
+};
+
+const recordTracksUserProfileCompleted = (
+	_context: CoreProfilerStateMachineContext,
+	event: Extract< UserProfileEvent, { type: 'USER_PROFILE_COMPLETED' } >
+) => {
+	recordEvent( 'storeprofiler_step_complete', {
+		step: 'user_profile',
+		wc_version: getSetting( 'wcVersion' ),
+	} );
+
+	recordEvent( 'storeprofiler_user_profile', {
+		business_choice: event.payload.userProfile.businessChoice,
+		selling_online_answer: event.payload.userProfile.sellingOnlineAnswer,
+		selling_platforms: event.payload.userProfile.sellingPlatforms
+			? event.payload.userProfile.sellingPlatforms.join()
+			: null,
+	} );
+};
+
+const recordTracksUserProfileSkipped = () => {
+	recordEvent( 'storeprofiler_user_profile_skip' );
+};
+
+const recordTracksSkipBusinessLocationViewed = () => {
+	recordEvent( 'storeprofiler_step_view', {
+		step: 'skip_business_location',
+		wc_version: getSetting( 'wcVersion' ),
+	} );
+};
+
+const recordTracksSkipBusinessLocationCompleted = () => {
+	recordEvent( 'storeprofiler_step_complete', {
+		step: 'skp_business_location',
+		wc_version: getSetting( 'wcVersion' ),
+	} );
+};
+
 const updateTrackingOption = (
 	_context: CoreProfilerStateMachineContext,
 	event: IntroOptInEvent
@@ -154,6 +260,34 @@ const updateTrackingOption = (
 	} );
 };
 
+const updateOnboardingProfileOption = (
+	context: CoreProfilerStateMachineContext
+) => {
+	const { businessChoice, sellingOnlineAnswer, sellingPlatforms, ...rest } =
+		context.userProfile;
+
+	return dispatch( OPTIONS_STORE_NAME ).updateOptions( {
+		woocommerce_onboarding_profile: {
+			...rest,
+			business_choice: businessChoice,
+			selling_online_answer: sellingOnlineAnswer,
+			selling_platforms: sellingPlatforms,
+		},
+	} );
+};
+
+const updateBusinessLocation = ( countryAndState: string ) => {
+	return dispatch( OPTIONS_STORE_NAME ).updateOptions( {
+		woocommerce_default_country: countryAndState,
+	} );
+};
+
+const promiseDelay = ( milliseconds: number ) => {
+	return new Promise( ( resolve ) => {
+		setTimeout( resolve, milliseconds );
+	} );
+};
+
 /**
  * Assigns the optInDataSharing value from the event payload to the context
  */
@@ -162,7 +296,59 @@ const assignOptInDataSharing = assign( {
 		event.payload.optInDataSharing,
 } );
 
-const coreProfilerStateMachineDefinition = createMachine( {
+/**
+ * Prefetch it so that @wp/data caches it and there won't be a loading delay when its used
+ */
+const preFetchGetExtensions = assign( {
+	extensionsRef: () =>
+		spawn(
+			resolveSelect( ONBOARDING_STORE_NAME ).getFreeExtensions(),
+			'core-profiler-prefetch-extensions'
+		),
+} );
+
+const getExtensions = async () => {
+	const extensionsBundles = await resolveSelect(
+		ONBOARDING_STORE_NAME
+	).getFreeExtensions();
+	return (
+		extensionsBundles.find( ( bundle ) => bundle.key === 'obw/grow' )
+			?.plugins || []
+	);
+};
+
+const handleExtensions = assign( {
+	extensionsAvailable: ( _context, event: DoneInvokeEvent< Extension[] > ) =>
+		event.data,
+} );
+
+const coreProfilerMachineActions = {
+	updateTrackingOption,
+	preFetchGetExtensions,
+	preFetchGetCountries,
+	handleTrackingOption,
+	handleExtensions,
+	recordTracksIntroCompleted,
+	recordTracksIntroSkipped,
+	recordTracksIntroViewed,
+	recordTracksUserProfileCompleted,
+	recordTracksUserProfileSkipped,
+	recordTracksUserProfileViewed,
+	recordTracksSkipBusinessLocationViewed,
+	recordTracksSkipBusinessLocationCompleted,
+	assignOptInDataSharing,
+	handleCountries,
+	handleOnboardingProfileOption,
+	redirectToWooHome,
+};
+
+const coreProfilerMachineServices = {
+	getAllowTrackingOption,
+	getCountries,
+	getExtensions,
+	getOnboardingProfileOption,
+};
+export const coreProfilerStateMachineDefinition = createMachine( {
 	id: 'coreProfiler',
 	initial: 'initializing',
 	predictableActionArguments: true, // recommended setting: https://xstate.js.org/docs/guides/actions.html
@@ -175,6 +361,8 @@ const coreProfilerStateMachineDefinition = createMachine( {
 		businessInfo: { location: 'US:CA' },
 		extensionsAvailable: [],
 		extensionsSelected: [],
+		countries: {},
+		loader: {},
 	} as CoreProfilerStateMachineContext,
 	states: {
 		initializing: {
@@ -183,6 +371,7 @@ const coreProfilerStateMachineDefinition = createMachine( {
 					target: 'introOptIn',
 				},
 			},
+			entry: [ 'preFetchGetExtensions', 'preFetchGetCountries' ],
 			invoke: [
 				{
 					src: 'getAllowTrackingOption',
@@ -205,7 +394,7 @@ const coreProfilerStateMachineDefinition = createMachine( {
 		introOptIn: {
 			on: {
 				INTRO_COMPLETED: {
-					target: 'userProfile',
+					target: 'preUserProfile',
 					actions: [
 						'assignOptInDataSharing',
 						'updateTrackingOption',
@@ -213,7 +402,7 @@ const coreProfilerStateMachineDefinition = createMachine( {
 				},
 				INTRO_SKIPPED: {
 					// if the user skips the intro, we set the optInDataSharing to false and go to the Business Location page
-					target: 'skipFlowBusinessLocation',
+					target: 'preSkipFlowBusinessLocation',
 					actions: [
 						'assignOptInDataSharing',
 						'updateTrackingOption',
@@ -237,10 +426,25 @@ const coreProfilerStateMachineDefinition = createMachine( {
 				component: IntroOptIn,
 			},
 		},
+		preUserProfile: {
+			invoke: {
+				src: 'getOnboardingProfileOption',
+				onDone: [
+					{
+						actions: [ 'handleOnboardingProfileOption' ],
+						target: 'userProfile',
+					},
+				],
+				onError: {
+					target: 'userProfile',
+				},
+			},
+		},
 		userProfile: {
+			entry: [ 'recordTracksUserProfileViewed' ],
 			on: {
 				USER_PROFILE_COMPLETED: {
-					target: 'preBusinessInfo',
+					target: 'postUserProfile',
 					actions: [
 						assign( {
 							userProfile: ( context, event: UserProfileEvent ) =>
@@ -249,7 +453,7 @@ const coreProfilerStateMachineDefinition = createMachine( {
 					],
 				},
 				USER_PROFILE_SKIPPED: {
-					target: 'preBusinessInfo',
+					target: 'postUserProfile',
 					actions: [
 						assign( {
 							userProfile: ( context, event: UserProfileEvent ) =>
@@ -258,11 +462,36 @@ const coreProfilerStateMachineDefinition = createMachine( {
 					],
 				},
 			},
+			exit: actions.choose( [
+				{
+					cond: ( _context, event ) =>
+						event.type === 'USER_PROFILE_COMPLETED',
+					actions: 'recordTracksUserProfileCompleted',
+				},
+				{
+					cond: ( _context, event ) =>
+						event.type === 'USER_PROFILE_SKIPPED',
+					actions: 'recordTracksUserProfileSkipped',
+				},
+			] ),
 			meta: {
 				progress: 40,
 				component: UserProfile,
 			},
 		},
+		postUserProfile: {
+			invoke: {
+				src: ( context ) => {
+					return updateOnboardingProfileOption( context );
+				},
+				onDone: {
+					target: 'preBusinessInfo',
+				},
+				onError: {
+					target: 'preBusinessInfo',
+				},
+			},
+		},
 		preBusinessInfo: {
 			always: [
 				// immediately transition to businessInfo without any events as long as geolocation parallel has completed
@@ -294,10 +523,24 @@ const coreProfilerStateMachineDefinition = createMachine( {
 				component: BusinessInfo,
 			},
 		},
+		preSkipFlowBusinessLocation: {
+			invoke: {
+				src: 'getCountries',
+				onDone: [
+					{
+						actions: [ 'handleCountries' ],
+						target: 'skipFlowBusinessLocation',
+					},
+				],
+				onError: {
+					target: 'skipFlowBusinessLocation',
+				},
+			},
+		},
 		skipFlowBusinessLocation: {
 			on: {
 				BUSINESS_LOCATION_COMPLETED: {
-					target: 'settingUpStore',
+					target: 'postSkipFlowBusinessLocation',
 					actions: [
 						assign( {
 							businessInfo: (
@@ -305,22 +548,81 @@ const coreProfilerStateMachineDefinition = createMachine( {
 								event: BusinessLocationEvent
 							) => event.payload.businessInfo, // assign context.businessInfo to the payload of the event
 						} ),
+						'recordTracksSkipBusinessLocationCompleted',
 					],
 				},
 			},
+			entry: [ 'recordTracksSkipBusinessLocationViewed' ],
 			meta: {
 				progress: 80,
 				component: BusinessLocation,
 			},
 		},
-		preExtensions: {
-			always: [
-				// immediately transition to extensions without any events as long as extensions fetching parallel has completed
-				{
-					target: 'extensions',
-					cond: () => true, // TODO: use a custom function to check on the parallel state using meta when we implement that. https://xstate.js.org/docs/guides/guards.html#guards-condition-functions
+		postSkipFlowBusinessLocation: {
+			initial: 'updateBusinessLocation',
+			states: {
+				updateBusinessLocation: {
+					entry: assign( {
+						loader: {
+							progress: 10,
+						},
+					} ),
+					invoke: {
+						src: ( context ) => {
+							return updateBusinessLocation(
+								context.businessInfo.location
+							);
+						},
+						onDone: {
+							target: 'progress20',
+						},
+					},
 				},
-			],
+				// Although we don't need to wait 3 seconds for the following states
+				// We will dispaly 20% and 80% progress for 1.5 seconds each
+				// for the sake of user experience.
+				progress20: {
+					entry: assign( {
+						loader: {
+							progress: 20,
+						},
+					} ),
+					invoke: {
+						src: () => {
+							return promiseDelay( 1500 );
+						},
+						onDone: {
+							target: 'progress80',
+						},
+					},
+				},
+				progress80: {
+					entry: assign( {
+						loader: {
+							progress: 80,
+						},
+					} ),
+					invoke: {
+						src: () => {
+							return promiseDelay( 1500 );
+						},
+						onDone: {
+							actions: [ 'redirectToWooHome' ],
+						},
+					},
+				},
+			},
+			meta: {
+				component: Loader,
+			},
+		},
+		preExtensions: {
+			invoke: {
+				src: 'getExtensions',
+				onDone: [
+					{ target: 'extensions', actions: 'handleExtensions' },
+				],
+			},
 			// add exit action to filter the extensions using a custom function here and assign it to context.extensionsAvailable
 			exit: assign( {
 				extensionsAvailable: ( context ) => {
@@ -346,32 +648,41 @@ const coreProfilerStateMachineDefinition = createMachine( {
 	},
 } );
 
-const CoreProfilerController = ( {} ) => {
+export const CoreProfilerController = ( {
+	actionOverrides,
+	servicesOverrides,
+}: {
+	actionOverrides: Partial< typeof coreProfilerMachineActions >;
+	servicesOverrides: Partial< typeof coreProfilerMachineServices >;
+} ) => {
 	const augmentedStateMachine = useMemo( () => {
 		// When adding extensibility, this is the place to manipulate the state machine definition.
 		return coreProfilerStateMachineDefinition.withConfig( {
 			actions: {
-				updateTrackingOption,
-				handleTrackingOption,
-				recordTracksIntroCompleted,
-				recordTracksIntroSkipped,
-				recordTracksIntroViewed,
-				assignOptInDataSharing,
+				...coreProfilerMachineActions,
+				...actionOverrides,
 			},
 			services: {
-				getAllowTrackingOption,
+				...coreProfilerMachineServices,
+				...servicesOverrides,
 			},
 		} );
-	}, [] );
+	}, [ actionOverrides, servicesOverrides ] );
 
 	const [ state, send ] = useMachine( augmentedStateMachine );
-
-	const currentNodeMeta = state.meta[ `coreProfiler.${ state.value }` ]
-		? state.meta[ `coreProfiler.${ state.value }` ]
+	const stateValue =
+		typeof state.value === 'object'
+			? Object.keys( state.value )[ 0 ]
+			: state.value;
+	const currentNodeMeta = state.meta[ `coreProfiler.${ stateValue }` ]
+		? state.meta[ `coreProfiler.${ stateValue }` ]
 		: undefined;
 	const navigationProgress = currentNodeMeta?.progress; // This value is defined in each state node's meta tag, we can assume it is 0-100
 	const CurrentComponent =
-		currentNodeMeta?.component ?? ( () => <div>Insert Spinner</div> ); // If no component is defined for the state then its a loading state
+		currentNodeMeta?.component ??
+		( () => (
+			<div data-testid="core-profiler-loading-screen">Insert Spinner</div>
+		) ); // If no component is defined for the state then its a loading state
 
 	useEffect( () => {
 		document.body.classList.remove( 'woocommerce-admin-is-loading' );
diff --git a/plugins/woocommerce-admin/client/core-profiler/pages/BusinessLocation.tsx b/plugins/woocommerce-admin/client/core-profiler/pages/BusinessLocation.tsx
index 08fbfc99c0e..3c5fcf2bdbe 100644
--- a/plugins/woocommerce-admin/client/core-profiler/pages/BusinessLocation.tsx
+++ b/plugins/woocommerce-admin/client/core-profiler/pages/BusinessLocation.tsx
@@ -1,26 +1,100 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Button } from '@wordpress/components';
+import { SelectControl } from '@woocommerce/components';
+import { Icon, chevronDown } from '@wordpress/icons';
+import { useState } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
-import { BusinessLocationEvent } from '../index';
-
+import {
+	BusinessLocationEvent,
+	CoreProfilerStateMachineContext,
+} from '../index';
+import { CountryStateOption } from '../services/country';
+import { Heading } from '../components/heading/heading';
+import { Navigation } from '../components/navigation/navigation';
 export const BusinessLocation = ( {
 	sendEvent,
+	navigationProgress,
+	context,
 }: {
 	sendEvent: ( event: BusinessLocationEvent ) => void;
+	navigationProgress: number;
+	context: CoreProfilerStateMachineContext;
 } ) => {
+	const [ storeCountry, setStoreCountry ] = useState< CountryStateOption >( {
+		key: '',
+		label: '',
+	} );
+
+	const inputLabel = __( 'Select country/region', 'woocommerce' );
+
 	return (
-		<>
-			<div>Business Location</div>
-			<button
-				onClick={ () =>
-					sendEvent( {
-						type: 'BUSINESS_LOCATION_COMPLETED',
-						payload: { businessInfo: { location: 'Zanarkand' } },
-					} )
-				}
-			>
-				Next
-			</button>
-		</>
+		<div
+			className="woocommerce-profiler-business-location"
+			data-testid="core-profiler-business-location"
+		>
+			<Navigation percentage={ navigationProgress } />
+			<div className="woocommerce-profiler-page__content woocommerce-profiler-business-location__content">
+				<Heading
+					className="woocommerce-profiler__stepper-heading"
+					title={ __(
+						'Where is your business located?',
+						'woocommerce'
+					) }
+					subTitle={ __(
+						"We'll use this information to help you set up payments, shipping, and taxes.",
+						'woocommerce'
+					) }
+				/>
+				<SelectControl
+					className="woocommerce-profiler-select-control__country"
+					instanceId={ 1 }
+					placeholder={ inputLabel }
+					label={ storeCountry.key === '' ? inputLabel : '' }
+					getSearchExpression={ ( query: string ) => {
+						return new RegExp(
+							'(^' + query + '| — (' + query + '))',
+							'i'
+						);
+					} }
+					autoComplete="new-password" // disable autocomplete and autofill
+					options={ context.countries }
+					excludeSelectedOptions={ false }
+					help={ <Icon icon={ chevronDown } /> }
+					onChange={ ( results: Array< CountryStateOption > ) => {
+						if ( results.length ) {
+							setStoreCountry( results[ 0 ] );
+						}
+					} }
+					selected={ storeCountry ? [ storeCountry ] : [] }
+					showAllOnFocus
+					isSearchable
+				/>
+				<div className="woocommerce-profiler-button-container woocommerce-profiler-go-to-mystore__button-container">
+					<Button
+						className="woocommerce-profiler-button"
+						variant="primary"
+						disabled={ ! storeCountry.key }
+						onClick={ () => {
+							sendEvent( {
+								type: 'BUSINESS_LOCATION_COMPLETED',
+								payload: {
+									businessInfo: {
+										location: storeCountry.key,
+									},
+								},
+							} );
+						} }
+					>
+						{ __( 'Go to my store', 'woocommerce' ) }
+					</Button>
+				</div>
+			</div>
+		</div>
 	);
 };
diff --git a/plugins/woocommerce-admin/client/core-profiler/pages/Extensions.tsx b/plugins/woocommerce-admin/client/core-profiler/pages/Extensions.tsx
new file mode 100644
index 00000000000..ebac1868d63
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/pages/Extensions.tsx
@@ -0,0 +1,31 @@
+/**
+ * Internal dependencies
+ */
+import { CoreProfilerStateMachineContext, ExtensionsEvent } from '../index';
+
+export const Extensions = ( {
+	context,
+	sendEvent,
+}: {
+	context: CoreProfilerStateMachineContext;
+	sendEvent: ( payload: ExtensionsEvent ) => void;
+} ) => {
+	return (
+		<>
+			<div>Extensions</div>
+			<div>{ JSON.stringify( context.extensionsAvailable ) }</div>
+			<button
+				onClick={ () =>
+					sendEvent( {
+						type: 'EXTENSIONS_COMPLETED',
+						payload: {
+							extensionsSelected: [ 'woocommerce-payments' ],
+						},
+					} )
+				}
+			>
+				Next
+			</button>
+		</>
+	);
+};
diff --git a/plugins/woocommerce-admin/client/core-profiler/pages/IntroOptIn.tsx b/plugins/woocommerce-admin/client/core-profiler/pages/IntroOptIn.tsx
index 39584309ee0..0a0db6834d7 100644
--- a/plugins/woocommerce-admin/client/core-profiler/pages/IntroOptIn.tsx
+++ b/plugins/woocommerce-admin/client/core-profiler/pages/IntroOptIn.tsx
@@ -28,7 +28,10 @@ export const IntroOptIn = ( {
 	);
 
 	return (
-		<div className="woocommerce-profiler-intro-opt-in">
+		<div
+			className="woocommerce-profiler-intro-opt-in"
+			data-testid="core-profiler-intro-opt-in-screen"
+		>
 			<Navigation
 				percentage={ navigationProgress }
 				skipText={ __( 'Skip guided setup', 'woocommerce' ) }
diff --git a/plugins/woocommerce-admin/client/core-profiler/pages/Loader.tsx b/plugins/woocommerce-admin/client/core-profiler/pages/Loader.tsx
new file mode 100644
index 00000000000..5f2d284a9e2
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/pages/Loader.tsx
@@ -0,0 +1,74 @@
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+import { useState, useEffect } from '@wordpress/element';
+/**
+ * Internal dependencies
+ */
+import { CoreProfilerStateMachineContext } from '..';
+import ProgressBar from '../components/progress-bar/progress-bar';
+import { getLoaderStageMeta } from '../get-loader-stage-meta';
+
+export type Stage = {
+	title: string;
+	image?: string | JSX.Element;
+	paragraphs: Array< {
+		label: string;
+		text: string;
+		duration?: number;
+	} >;
+};
+
+export type Stages = Array< Stage >;
+
+export const Loader = ( {
+	context,
+}: {
+	context: CoreProfilerStateMachineContext;
+} ) => {
+	const stages = getLoaderStageMeta( context.loader.useStages ?? 'default' );
+	const currentStage = stages[ context.loader.stageIndex ?? 0 ];
+	const [ currentParagraph, setCurrentParagraph ] = useState( 0 );
+
+	useEffect( () => {
+		const interval = setInterval( () => {
+			setCurrentParagraph( ( _currentParagraph ) =>
+				currentStage.paragraphs[ _currentParagraph + 1 ]
+					? _currentParagraph + 1
+					: 0
+			);
+		}, currentStage.paragraphs[ currentParagraph ]?.duration ?? 3000 );
+
+		return () => clearInterval( interval );
+	}, [ currentParagraph, currentStage.paragraphs ] );
+
+	return (
+		<div
+			className={ classNames(
+				'woocommerce-profiler-loader',
+				context.loader.className
+			) }
+		>
+			<div className="woocommerce-profiler-loader-wrapper">
+				{ currentStage.image && currentStage.image }
+
+				<h1 className="woocommerce-profiler-loader__title">
+					{ currentStage.title }
+				</h1>
+				<ProgressBar
+					className={ 'progress-bar' }
+					percent={ context.loader.progress ?? 0 }
+					color={ 'var(--wp-admin-theme-color)' }
+					bgcolor={ '#E0E0E0' }
+				/>
+				<p className="woocommerce-profiler-loader__paragraph">
+					<b>
+						{ currentStage.paragraphs[ currentParagraph ]?.label }{ ' ' }
+					</b>
+					{ currentStage.paragraphs[ currentParagraph ]?.text }
+				</p>
+			</div>
+		</div>
+	);
+};
diff --git a/plugins/woocommerce-admin/client/core-profiler/pages/UserProfile.tsx b/plugins/woocommerce-admin/client/core-profiler/pages/UserProfile.tsx
index 5077bceb3e3..a05e2bc57f4 100644
--- a/plugins/woocommerce-admin/client/core-profiler/pages/UserProfile.tsx
+++ b/plugins/woocommerce-admin/client/core-profiler/pages/UserProfile.tsx
@@ -1,41 +1,299 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Button } from '@wordpress/components';
+import { useState } from '@wordpress/element';
+import { SelectControl } from '@woocommerce/components';
+import { Icon, chevronDown } from '@wordpress/icons';
+import classnames from 'classnames';
+
 /**
  * Internal dependencies
  */
-import { UserProfileEvent } from '../index';
+import { UserProfileEvent, CoreProfilerStateMachineContext } from '../index';
+import { Navigation } from '../components/navigation/navigation';
+import { Heading } from '../components/heading/heading';
+import { Choice } from '../components/choice/choice';
+import { MultipleSelector } from '../components/multiple-selector/multiple-selector';
+
+const businessOptions = [
+	{
+		title: __( "I'm just starting my business", 'woocommerce' ),
+		value: 'im_just_starting_my_business' as const,
+	},
+	{
+		title: __( "I'm already selling", 'woocommerce' ),
+		value: 'im_already_selling' as const,
+	},
+	{
+		title: __( "I'm setting up a store for a client", 'woocommerce' ),
+		value: 'im_setting_up_a_store_for_a_client' as const,
+	},
+];
+
+const sellingOnlineOptions = [
+	{
+		label: __( "Yes, I'm selling online", 'woocommerce' ),
+		value: 'yes_im_selling_online' as const,
+		key: 'yes_im_selling_online' as const,
+	},
+	{
+		label: __( "No, I'm selling offline", 'woocommerce' ),
+		value: 'no_im_selling_offline' as const,
+		key: 'no_im_selling_offline' as const,
+	},
+	{
+		label: __( "I'm selling both online and offline", 'woocommerce' ),
+		value: 'im_selling_both_online_and_offline' as const,
+		key: 'im_selling_both_online_and_offline' as const,
+	},
+];
+
+const platformOptions = [
+	{
+		label: __( 'Amazon', 'woocommerce' ),
+		value: 'amazon' as const,
+	},
+	{
+		label: __( 'Adobe Commerce', 'woocommerce' ),
+		value: 'adobe_commerce' as const,
+	},
+	{
+		label: __( 'Big Cartel', 'woocommerce' ),
+		value: 'big_cartel' as const,
+	},
+	{
+		label: __( 'Big Commerce', 'woocommerce' ),
+		value: 'big_commerce' as const,
+	},
+	{
+		label: __( 'Ebay', 'woocommerce' ),
+		value: 'ebay' as const,
+	},
+	{
+		label: __( 'Ecwid', 'woocommerce' ),
+		value: 'ecwid' as const,
+	},
+	{
+		label: __( 'Etsy', 'woocommerce' ),
+		value: 'etsy' as const,
+	},
+	{
+		label: __( 'Facebook Marketplace', 'woocommerce' ),
+		value: 'facebook_marketplace' as const,
+	},
+	{
+		label: __( 'Google Shopping', 'woocommerce' ),
+		value: 'google_shopping' as const,
+	},
+	{
+		label: __( 'Pinterest', 'woocommerce' ),
+		value: 'pinterest' as const,
+	},
+	{
+		label: __( 'Shopify', 'woocommerce' ),
+		value: 'shopify' as const,
+	},
+	{
+		label: __( 'Square', 'woocommerce' ),
+		value: 'square' as const,
+	},
+	{
+		label: __( 'Squarespace', 'woocommerce' ),
+		value: 'squarespace' as const,
+	},
+	{
+		label: __( 'Wix', 'woocommerce' ),
+		value: 'wix' as const,
+	},
+	{
+		label: __( 'WordPress', 'woocommerce' ),
+		value: 'wordpress' as const,
+	},
+];
+
+export type BusinessChoice = typeof businessOptions[ 0 ][ 'value' ];
+export type SellingOnlineAnswer = typeof sellingOnlineOptions[ 0 ][ 'value' ];
+export type SellingPlatform = typeof platformOptions[ 0 ][ 'value' ];
 
 export const UserProfile = ( {
 	sendEvent,
+	navigationProgress,
+	context,
 }: {
 	sendEvent: ( event: UserProfileEvent ) => void;
+	navigationProgress: number;
+	context: CoreProfilerStateMachineContext;
 } ) => {
+	const [ businessChoice, setBusinessChoice ] = useState< BusinessChoice >(
+		context.userProfile.businessChoice || 'im_just_starting_my_business'
+	);
+	const [ sellingOnlineAnswer, setSellingOnlineAnswer ] =
+		useState< SellingOnlineAnswer | null >(
+			context.userProfile.sellingOnlineAnswer || null
+		);
+	const [ sellingPlatforms, setSellingPlatforms ] =
+		useState< Array< SellingPlatform > | null >(
+			context.userProfile.sellingPlatforms || null
+		);
+	const [ isPlatformDropdownOpen, setIsPlatformDropdownOpen ] =
+		useState( false );
+
+	const renderAlreadySellingOptions = () => {
+		return (
+			<>
+				<div className="woocommerce-profiler-selling-online-question">
+					<p className="woocommerce-profiler-question-label">
+						{ __( 'Are you selling online?', 'woocommerce' ) }
+					</p>
+					<SelectControl
+						className="woocommerce-profiler-select-control__selling-online-question"
+						instanceId={ 1 }
+						label={ __( 'Select an option', 'woocommerce' ) }
+						autoComplete="new-password" // disable autocomplete and autofill
+						options={ sellingOnlineOptions }
+						excludeSelectedOptions={ false }
+						help={ <Icon icon={ chevronDown } /> }
+						onChange={ (
+							selectedOptionKey: typeof sellingOnlineAnswer
+						) => {
+							setSellingOnlineAnswer( selectedOptionKey );
+						} }
+						multiple={ false }
+						selected={ sellingOnlineAnswer }
+					/>
+				</div>
+				{ sellingOnlineAnswer &&
+					[
+						'yes_im_selling_online',
+						'im_selling_both_online_and_offline',
+					].includes( sellingOnlineAnswer ) && (
+						<div className="woocommerce-profiler-selling-platform">
+							<p className="woocommerce-profiler-question-label">
+								{ __(
+									'Which platform(s) are you currently using?',
+									'woocommerce'
+								) }
+							</p>
+							<MultipleSelector
+								options={ platformOptions }
+								selectedOptions={ platformOptions.filter(
+									( option ) =>
+										sellingPlatforms?.includes(
+											option.value
+										)
+								) }
+								onSelect={ ( items ) => {
+									setSellingPlatforms(
+										items.map(
+											( item ) =>
+												item.value as SellingPlatform
+										)
+									);
+								} }
+								onOpenClose={ setIsPlatformDropdownOpen }
+							/>
+						</div>
+					) }
+			</>
+		);
+	};
+
+	const onContinue = () => {
+		sendEvent( {
+			type: 'USER_PROFILE_COMPLETED',
+			payload: {
+				userProfile: {
+					businessChoice,
+					sellingOnlineAnswer:
+						businessChoice === 'im_already_selling'
+							? sellingOnlineAnswer
+							: null,
+					sellingPlatforms:
+						businessChoice === 'im_already_selling'
+							? sellingPlatforms
+							: null,
+				},
+			},
+		} );
+	};
+
 	return (
-		<>
-			<div>User Profile</div>
-			<button
-				onClick={ () =>
-					sendEvent( {
-						type: 'USER_PROFILE_COMPLETED',
-						payload: {
-							userProfile: {
-								foo: { bar: 'qux' },
-								skipped: false,
-							},
-						},
-					} )
-				}
-			>
-				Next
-			</button>
-			<button
-				onClick={ () =>
+		<div
+			className="woocommerce-profiler-user-profile"
+			data-testid="core-profiler-user-profile"
+		>
+			<Navigation
+				percentage={ navigationProgress }
+				skipText={ __( 'Skip this setup', 'woocommerce' ) }
+				onSkip={ () =>
 					sendEvent( {
 						type: 'USER_PROFILE_SKIPPED',
 						payload: { userProfile: { skipped: true } },
 					} )
 				}
+			/>
+			<div
+				className={ classnames(
+					'woocommerce-profiler-page__content woocommerce-profiler-user-profile__content',
+					{
+						'is-platform-selector-open': isPlatformDropdownOpen,
+					}
+				) }
 			>
-				Skip
-			</button>
-		</>
+				<Heading
+					className="woocommerce-profiler__stepper-heading"
+					title={ __(
+						'Which one of these best describes you?',
+						'woocommerce'
+					) }
+					subTitle={ __(
+						'Let us know where you are in your commerce journey so that we can tailor your Woo experience for you.',
+						'woocommerce'
+					) }
+				/>
+				<form className="woocommerce-user-profile-choices">
+					<fieldset>
+						<legend className="screen-reader-text">
+							{ __(
+								'Which one of these best describes you?',
+								'woocommerce'
+							) }
+						</legend>
+						{ businessOptions.map( ( { title, value } ) => {
+							return (
+								<Choice
+									key={ value }
+									name="user-profile-choice"
+									title={ title }
+									selected={ businessChoice === value }
+									value={ value }
+									onChange={ ( _value ) => {
+										setBusinessChoice(
+											_value as BusinessChoice
+										);
+									} }
+									subOptionsComponent={
+										value === 'im_already_selling'
+											? renderAlreadySellingOptions()
+											: null
+									}
+								/>
+							);
+						} ) }
+					</fieldset>
+				</form>
+				<div className="woocommerce-profiler-button-container">
+					<Button
+						className="woocommerce-profiler-button"
+						variant="primary"
+						onClick={ onContinue }
+					>
+						{ __( 'Continue', 'woocommerce' ) }
+					</Button>
+				</div>
+			</div>
+		</div>
 	);
 };
diff --git a/plugins/woocommerce-admin/client/core-profiler/pages/tests/user-profile.test.tsx b/plugins/woocommerce-admin/client/core-profiler/pages/tests/user-profile.test.tsx
new file mode 100644
index 00000000000..6c60b07a270
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/pages/tests/user-profile.test.tsx
@@ -0,0 +1,129 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+/**
+ * External dependencies
+ */
+import { render, screen, fireEvent } from '@testing-library/react';
+
+/**
+ * Internal dependencies
+ */
+import { UserProfile } from '../UserProfile';
+import { CoreProfilerStateMachineContext } from '../..';
+
+describe( 'UserProfile', () => {
+	let props: {
+		sendEvent: jest.Mock;
+		navigationProgress: number;
+		context: Pick< CoreProfilerStateMachineContext, 'userProfile' >;
+	};
+
+	beforeEach( () => {
+		props = {
+			sendEvent: jest.fn(),
+			navigationProgress: 0,
+			context: {
+				userProfile: {
+					businessChoice: 'im_just_starting_my_business',
+					sellingOnlineAnswer: null,
+					sellingPlatforms: null,
+				},
+			},
+		};
+	} );
+
+	it( 'should render user profile page', () => {
+		// @ts-ignore
+		render( <UserProfile { ...props } /> );
+		expect(
+			screen.getByText( /Which one of these best describes you?/i, {
+				selector: 'h1',
+			} )
+		).toBeInTheDocument();
+		expect(
+			screen.getByRole( 'button', {
+				name: /Continue/i,
+			} )
+		).toBeInTheDocument();
+	} );
+
+	it( 'should show online selling question when choosing "im_already_selling"', () => {
+		// @ts-ignore
+		render( <UserProfile { ...props } /> );
+		const radioInput = screen.getByLabelText< HTMLInputElement >(
+			"I'm already selling"
+		); // Replace with the label of your radio button
+
+		// Perform the radio button selection
+		fireEvent.click( radioInput );
+
+		// Assert the expected behavior
+		expect( radioInput.checked ).toBe( true );
+
+		const onlineSellingQuestion = screen.getByText(
+			/Are you selling online?/i
+		);
+		expect( onlineSellingQuestion ).toBeInTheDocument();
+	} );
+
+	it( 'should show online selling question when choosing "Yes, I\'m selling online"', () => {
+		render(
+			// @ts-ignore
+			<UserProfile
+				{ ...{
+					...props,
+					context: {
+						userProfile: {
+							businessChoice: 'im_already_selling',
+							sellingOnlineAnswer: 'yes_im_selling_online',
+							sellingPlatforms: null,
+						},
+					},
+				} }
+			/>
+		);
+		const platformSelector = screen.getByLabelText( /Select an option/i );
+		expect( platformSelector ).toBeInTheDocument();
+	} );
+
+	it( 'should call sendEvent with USER_PROFILE_COMPLETED event when button is clicked', () => {
+		render(
+			// @ts-ignore
+			<UserProfile { ...props } />
+		);
+		screen
+			.getByRole( 'button', {
+				name: /Continue/i,
+			} )
+			.click();
+		expect( props.sendEvent ).toHaveBeenCalledWith( {
+			type: 'USER_PROFILE_COMPLETED',
+			payload: {
+				userProfile: {
+					businessChoice: 'im_just_starting_my_business',
+					sellingOnlineAnswer: null,
+					sellingPlatforms: null,
+				},
+			},
+		} );
+	} );
+
+	it( 'should call sendEvent with USER_PROFILE_SKIPPED event when skip button is clicked', () => {
+		render(
+			// @ts-ignore
+			<UserProfile { ...props } />
+		);
+		screen
+			.getByRole( 'button', {
+				name: /Skip this setup/i,
+			} )
+			.click();
+		expect( props.sendEvent ).toHaveBeenCalledWith( {
+			type: 'USER_PROFILE_SKIPPED',
+			payload: {
+				userProfile: {
+					skipped: true,
+				},
+			},
+		} );
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/core-profiler/services/country.ts b/plugins/woocommerce-admin/client/core-profiler/services/country.ts
new file mode 100644
index 00000000000..d55ef6b3881
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/services/country.ts
@@ -0,0 +1,90 @@
+/**
+ * External dependencies
+ */
+import { Country } from '@woocommerce/data';
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Type definitions
+ */
+export type CountryStateOption = {
+	key: string;
+	label: string;
+};
+
+type UserLocation = {
+	latitude: string;
+	longitude: string;
+	country_short: string;
+	country_long: string;
+	region: string;
+	city: string;
+};
+
+/**
+ * Get all country and state combinations used for select dropdowns.
+ *
+ * @return {Object} Select options, { value: 'US:GA', label: 'United States - Georgia' }
+ * @param  countries {Country[]} Countries object.
+ */
+export function getCountryStateOptions(
+	countries: Country[]
+): CountryStateOption[] {
+	const countryStateOptions: CountryStateOption[] = countries.reduce(
+		( acc, country ) => {
+			if ( ! country.states.length ) {
+				acc.push( {
+					key: country.code,
+					label: decodeEntities( country.name ),
+				} );
+				return acc;
+			}
+
+			const countryStates = country.states.map( ( state ) => {
+				return {
+					key: country.code + ':' + state.code,
+					label:
+						decodeEntities( country.name ) +
+						' — ' +
+						decodeEntities( state.name ),
+				};
+			} );
+			acc.push( ...countryStates );
+
+			return acc;
+		},
+		[] as CountryStateOption[]
+	);
+
+	return countryStateOptions;
+}
+
+/**
+ * Get the user's location
+ *
+ * @return {Object} {
+ *  latitude: '39.039474',
+ *  longitude: '-77.491809',
+ *  country_short: 'US',
+ *  country_long: 'United States of America',
+ *  region: 'Virginia',
+ *  city: 'Ashburn'
+ * }
+ */
+export const getUserLocation = (): Promise< UserLocation | null > => {
+	// cache buster
+	const v = new Date().getTime();
+	return fetch( 'https://public-api.wordpress.com/geo/?v=' + v )
+		.then( ( res ) => {
+			if ( ! res.ok ) {
+				// @ts-expect-error tmp
+				return res.body().then( ( body ) => {
+					throw new Error( body );
+				} );
+			}
+			return res.json();
+		} )
+		.catch( () => {
+			return null;
+		} );
+};
diff --git a/plugins/woocommerce-admin/client/core-profiler/services/test/country.test.ts b/plugins/woocommerce-admin/client/core-profiler/services/test/country.test.ts
new file mode 100644
index 00000000000..e3af5ac23a1
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/services/test/country.test.ts
@@ -0,0 +1,83 @@
+/**
+ * Internal dependencies
+ */
+import { getCountryStateOptions } from '../country';
+
+describe( 'getCountryStateOptions', () => {
+	it( 'should return an empty array when passed an empty array of countries', () => {
+		const result = getCountryStateOptions( [] );
+		expect( result ).toEqual( [] );
+	} );
+
+	it( 'should return an array of CountryStateOption objects when passed an array of countries with states', () => {
+		const countries = [
+			{
+				code: 'US',
+				name: 'United States',
+				states: [
+					{ code: 'CA', name: 'California' },
+					{ code: 'NY', name: 'New York' },
+				],
+			},
+			{
+				code: 'AU',
+				name: 'Australia',
+				states: [
+					{
+						code: 'NSW',
+						name: 'New South Wales',
+					},
+					{
+						code: 'VIC',
+						name: 'Victoria',
+					},
+				],
+			},
+		];
+		const expected = [
+			{ key: 'US:CA', label: 'United States — California' },
+			{ key: 'US:NY', label: 'United States — New York' },
+			{ key: 'AU:NSW', label: 'Australia — New South Wales' },
+			{ key: 'AU:VIC', label: 'Australia — Victoria' },
+		];
+		const result = getCountryStateOptions( countries );
+		expect( result ).toEqual( expected );
+	} );
+
+	it( 'should return an array of CountryStateOption objects with correct key and label properties when passed an array of countries with and without states', () => {
+		const countries = [
+			{
+				code: 'US',
+				name: 'United States',
+				states: [ { code: 'CA', name: 'California' } ],
+			},
+			{
+				code: 'GB',
+				name: 'United Kingdom',
+				states: [],
+			},
+			{
+				code: 'AU',
+				name: 'Australia',
+				states: [
+					{
+						code: 'NSW',
+						name: 'New South Wales',
+					},
+					{
+						code: 'VIC',
+						name: 'Victoria',
+					},
+				],
+			},
+		];
+		const expected = [
+			{ key: 'US:CA', label: 'United States — California' },
+			{ key: 'GB', label: 'United Kingdom' },
+			{ key: 'AU:NSW', label: 'Australia — New South Wales' },
+			{ key: 'AU:VIC', label: 'Australia — Victoria' },
+		];
+		const result = getCountryStateOptions( countries );
+		expect( result ).toEqual( expected );
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/core-profiler/style.scss b/plugins/woocommerce-admin/client/core-profiler/style.scss
index 86a5cb13774..ce77508a119 100644
--- a/plugins/woocommerce-admin/client/core-profiler/style.scss
+++ b/plugins/woocommerce-admin/client/core-profiler/style.scss
@@ -19,6 +19,85 @@
 	@include breakpoint( '<782px' ) {
 		padding: 0 20px;
 	}
+
+	.woocommerce-profiler-button-container {
+		width: 100%;
+		max-width: 404px;
+		@include breakpoint( '<782px' ) {
+			position: absolute;
+			bottom: 20px;
+			padding: 0 20px;
+		}
+	}
+
+	.woocommerce-profiler-button {
+		display: flex;
+		width: 100%;
+		justify-content: center;
+		padding: 10px 16px;
+		height: 48px;
+		font-size: 14px;
+		font-weight: 500;
+	}
+
+	.woocommerce-select-control__option {
+		font-size: 13px;
+		height: 40px;
+		min-height: initial;
+
+		&:hover {
+			background: #eff2fd;
+			color: $gray-900;
+		}
+	}
+	.woocommerce-select-control__listbox {
+		box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
+		border: 1px solid #ccc;
+		margin-top: 8px;
+		top: 40px;
+	}
+
+	.woocommerce-select-control__control {
+		height: 40px;
+		padding: 12px;
+		border: 1px solid #bbb;
+
+		label,
+		.woocommerce-select-control__control-input {
+			font-size: 13px;
+			cursor: pointer;
+		}
+
+		.components-base-control__label {
+			font-size: 13px;
+			line-height: 16px;
+			color: $gray-700;
+		}
+
+		&.with-value {
+			.woocommerce-select-control__control-input {
+				margin: 0;
+				color: $gray-900;
+			}
+
+			.components-base-control__label {
+				display: none;
+			}
+		}
+
+		&.is-active {
+			border: 1px solid var(--wp-admin-theme-color);
+		}
+	}
+
+	#woocommerce-select-control__listbox-0 {
+		top: 40px !important;
+	}
+}
+
+.woocommerce-profiler-select-control__country {
+	max-width: 404px;
+	margin: auto auto 32px auto;
 }
 
 // Intro opt-in page
@@ -44,11 +123,13 @@
 		margin-bottom: 48px;
 		width: 266px;
 		height: 172px;
-		background: url(./assets/images/welcome-desktop.svg) no-repeat center center;
+		background: url(./assets/images/welcome-desktop.svg) no-repeat center
+			center;
 
 		@include breakpoint( '<782px' ) {
 			margin-bottom: 40px;
-			background: url(./assets/images/welcome-mobile.svg) no-repeat center center;
+			background: url(./assets/images/welcome-mobile.svg) no-repeat
+				center center;
 			width: 222px;
 			height: 144px;
 		}
@@ -115,6 +196,11 @@
 				max-width: 514px;
 				margin-left: 10px;
 			}
+
+			.woocommerce-select-control__control-input {
+				font-size: 13px;
+				line-height: 16px;
+			}
 		}
 
 		a {
@@ -122,3 +208,139 @@
 		}
 	}
 }
+
+// Business location page
+.woocommerce-profiler-business-location {
+	display: flex;
+	flex-direction: column;
+	.woocommerce-profiler-business-location__content {
+		max-width: 550px;
+		width: 100%;
+		display: flex;
+		align-self: center;
+
+		& > div {
+			width: 100%;
+		}
+
+		.components-base-control__field {
+			height: 40px;
+		}
+
+		.woocommerce-select-control__control-icon {
+			display: none;
+		}
+
+		.woocommerce-select-control__control.is-active {
+			.components-base-control__label {
+				display: none;
+			}
+		}
+
+		.woocommerce-select-control.is-searchable
+		.woocommerce-select-control__control-input {
+			margin: 0;
+			padding: 0;
+		}
+
+		.woocommerce-select-control.is-searchable
+		.components-base-control__label {
+			left: 13px;
+		}
+	}
+}
+
+// Loader page
+.woocommerce-profiler-loader {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	position: absolute;
+	@include breakpoint( '<782px' ) {
+		padding: 0 20px;
+	}
+
+	h1 {
+		padding: 0;
+		margin: 58px 0 0 0;
+		font-size: 28px;
+		font-weight: 500;
+		@include breakpoint( '<782px' ) {
+			font-size: 20px;
+		}
+	}
+	.woocommerce-profiler-loader-wrapper {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		max-width: 520px;
+	}
+	.woocommerce-profiler-progress-bar {
+		width: 520px;
+		margin: 16px 0 16px 0;
+		@include breakpoint( '<782px' ) {
+			width: 100%;
+		}
+	}
+	.woocommerce-profiler-progress-bar__container {
+		height: 4px;
+	}
+
+	.woocommerce-profiler-loader__paragraph {
+		font-size: 16px;
+		line-height: 24px;
+		color: #2f2f2f;
+		opacity: 0.8;
+		text-align: center;
+		@include breakpoint( '<782px' ) {
+			font-size: 14px;
+			line-height: 20px;
+		}
+	}
+}
+
+// User profile page
+.woocommerce-profiler-user-profile {
+	.woocommerce-profiler-user-profile__content {
+		min-height: 630px;
+
+		&.is-platform-selector-open {
+			padding-bottom: 145px;
+		}
+	}
+
+	.woocommerce-user-profile-choices {
+		margin-bottom: 32px;
+		max-width: 404px;
+		width: 100%;
+	}
+
+	.woocommerce-profiler-heading__title {
+		max-width: 480px;
+	}
+
+	.woocommerce-user-profile-choices fieldset {
+		display: flex;
+		gap: 18px;
+		flex-direction: column;
+	}
+
+	.woocommerce-profiler-choice-sub-options {
+		.woocommerce-profiler-question-label {
+			text-transform: uppercase;
+			color: $gray-900;
+			font-weight: 500;
+			font-size: 11px;
+			line-height: 16px;
+			margin: 0 0 8px;
+		}
+	}
+
+	.woocommerce-profiler-selling-platform {
+		margin-top: 20px;
+	}
+}
diff --git a/plugins/woocommerce-admin/client/core-profiler/test/__snapshots__/core-profiler-machine.test.tsx.snap b/plugins/woocommerce-admin/client/core-profiler/test/__snapshots__/core-profiler-machine.test.tsx.snap
new file mode 100644
index 00000000000..cb2aa9f7603
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/test/__snapshots__/core-profiler-machine.test.tsx.snap
@@ -0,0 +1,3444 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "initializing"  via  1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+      >
+        <div
+          class="woocommerce-profiler-intro-opt-in"
+          data-testid="core-profiler-intro-opt-in-screen"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 20%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip guided setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+          >
+            <div
+              class="woocommerce-profiler-welcome-image"
+            />
+            <div
+              class="woocommerce-profiler-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Welcome to Woo!
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+              </h2>
+            </div>
+            <button
+              class="components-button woocommerce-profiler-setup-store__button is-primary"
+              type="button"
+            >
+              Set up my store
+            </button>
+            <div
+              class="woocommerce-profiler-intro-opt-in__footer"
+            >
+              <div
+                class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+              >
+                <div
+                  class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+                >
+                  <span
+                    class="components-checkbox-control__input-container"
+                  >
+                    <input
+                      checked=""
+                      class="components-checkbox-control__input"
+                      id="inspector-checkbox-control-0"
+                      type="checkbox"
+                      value="1"
+                    />
+                    <svg
+                      aria-hidden="true"
+                      class="components-checkbox-control__checked"
+                      focusable="false"
+                      height="24"
+                      role="presentation"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                      />
+                    </svg>
+                  </span>
+                  <label
+                    class="components-checkbox-control__label"
+                    for="inspector-checkbox-control-0"
+                  >
+                    I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                    <a
+                      data-link-type="external"
+                      href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                      target="_blank"
+                    >
+                      Learn more about usage tracking
+                    </a>
+                    .
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+    >
+      <div
+        class="woocommerce-profiler-intro-opt-in"
+        data-testid="core-profiler-intro-opt-in-screen"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 20%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip guided setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+        >
+          <div
+            class="woocommerce-profiler-welcome-image"
+          />
+          <div
+            class="woocommerce-profiler-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Welcome to Woo!
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+            </h2>
+          </div>
+          <button
+            class="components-button woocommerce-profiler-setup-store__button is-primary"
+            type="button"
+          >
+            Set up my store
+          </button>
+          <div
+            class="woocommerce-profiler-intro-opt-in__footer"
+          >
+            <div
+              class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+            >
+              <div
+                class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+              >
+                <span
+                  class="components-checkbox-control__input-container"
+                >
+                  <input
+                    checked=""
+                    class="components-checkbox-control__input"
+                    id="inspector-checkbox-control-0"
+                    type="checkbox"
+                    value="1"
+                  />
+                  <svg
+                    aria-hidden="true"
+                    class="components-checkbox-control__checked"
+                    focusable="false"
+                    height="24"
+                    role="presentation"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                    />
+                  </svg>
+                </span>
+                <label
+                  class="components-checkbox-control__label"
+                  for="inspector-checkbox-control-0"
+                >
+                  I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                  <a
+                    data-link-type="external"
+                    href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                    target="_blank"
+                  >
+                    Learn more about usage tracking
+                  </a>
+                  .
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "introOptIn"  via INITIALIZATION_COMPLETE 1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+      >
+        <div
+          class="woocommerce-profiler-intro-opt-in"
+          data-testid="core-profiler-intro-opt-in-screen"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 20%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip guided setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+          >
+            <div
+              class="woocommerce-profiler-welcome-image"
+            />
+            <div
+              class="woocommerce-profiler-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Welcome to Woo!
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+              </h2>
+            </div>
+            <button
+              class="components-button woocommerce-profiler-setup-store__button is-primary"
+              type="button"
+            >
+              Set up my store
+            </button>
+            <div
+              class="woocommerce-profiler-intro-opt-in__footer"
+            >
+              <div
+                class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+              >
+                <div
+                  class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+                >
+                  <span
+                    class="components-checkbox-control__input-container"
+                  >
+                    <input
+                      checked=""
+                      class="components-checkbox-control__input"
+                      id="inspector-checkbox-control-1"
+                      type="checkbox"
+                      value="1"
+                    />
+                    <svg
+                      aria-hidden="true"
+                      class="components-checkbox-control__checked"
+                      focusable="false"
+                      height="24"
+                      role="presentation"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                      />
+                    </svg>
+                  </span>
+                  <label
+                    class="components-checkbox-control__label"
+                    for="inspector-checkbox-control-1"
+                  >
+                    I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                    <a
+                      data-link-type="external"
+                      href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                      target="_blank"
+                    >
+                      Learn more about usage tracking
+                    </a>
+                    .
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+    >
+      <div
+        class="woocommerce-profiler-intro-opt-in"
+        data-testid="core-profiler-intro-opt-in-screen"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 20%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip guided setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+        >
+          <div
+            class="woocommerce-profiler-welcome-image"
+          />
+          <div
+            class="woocommerce-profiler-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Welcome to Woo!
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+            </h2>
+          </div>
+          <button
+            class="components-button woocommerce-profiler-setup-store__button is-primary"
+            type="button"
+          >
+            Set up my store
+          </button>
+          <div
+            class="woocommerce-profiler-intro-opt-in__footer"
+          >
+            <div
+              class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+            >
+              <div
+                class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+              >
+                <span
+                  class="components-checkbox-control__input-container"
+                >
+                  <input
+                    checked=""
+                    class="components-checkbox-control__input"
+                    id="inspector-checkbox-control-1"
+                    type="checkbox"
+                    value="1"
+                  />
+                  <svg
+                    aria-hidden="true"
+                    class="components-checkbox-control__checked"
+                    focusable="false"
+                    height="24"
+                    role="presentation"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                    />
+                  </svg>
+                </span>
+                <label
+                  class="components-checkbox-control__label"
+                  for="inspector-checkbox-control-1"
+                >
+                  I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                  <a
+                    data-link-type="external"
+                    href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                    target="_blank"
+                  >
+                    Learn more about usage tracking
+                  </a>
+                  .
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "introOptIn"  via INITIALIZATION_COMPLETE 2`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+      >
+        <div
+          class="woocommerce-profiler-intro-opt-in"
+          data-testid="core-profiler-intro-opt-in-screen"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 20%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip guided setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+          >
+            <div
+              class="woocommerce-profiler-welcome-image"
+            />
+            <div
+              class="woocommerce-profiler-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Welcome to Woo!
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+              </h2>
+            </div>
+            <button
+              class="components-button woocommerce-profiler-setup-store__button is-primary"
+              type="button"
+            >
+              Set up my store
+            </button>
+            <div
+              class="woocommerce-profiler-intro-opt-in__footer"
+            >
+              <div
+                class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+              >
+                <div
+                  class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+                >
+                  <span
+                    class="components-checkbox-control__input-container"
+                  >
+                    <input
+                      checked=""
+                      class="components-checkbox-control__input"
+                      id="inspector-checkbox-control-1"
+                      type="checkbox"
+                      value="1"
+                    />
+                    <svg
+                      aria-hidden="true"
+                      class="components-checkbox-control__checked"
+                      focusable="false"
+                      height="24"
+                      role="presentation"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                      />
+                    </svg>
+                  </span>
+                  <label
+                    class="components-checkbox-control__label"
+                    for="inspector-checkbox-control-1"
+                  >
+                    I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                    <a
+                      data-link-type="external"
+                      href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                      target="_blank"
+                    >
+                      Learn more about usage tracking
+                    </a>
+                    .
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+    >
+      <div
+        class="woocommerce-profiler-intro-opt-in"
+        data-testid="core-profiler-intro-opt-in-screen"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 20%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip guided setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+        >
+          <div
+            class="woocommerce-profiler-welcome-image"
+          />
+          <div
+            class="woocommerce-profiler-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Welcome to Woo!
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+            </h2>
+          </div>
+          <button
+            class="components-button woocommerce-profiler-setup-store__button is-primary"
+            type="button"
+          >
+            Set up my store
+          </button>
+          <div
+            class="woocommerce-profiler-intro-opt-in__footer"
+          >
+            <div
+              class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+            >
+              <div
+                class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+              >
+                <span
+                  class="components-checkbox-control__input-container"
+                >
+                  <input
+                    checked=""
+                    class="components-checkbox-control__input"
+                    id="inspector-checkbox-control-1"
+                    type="checkbox"
+                    value="1"
+                  />
+                  <svg
+                    aria-hidden="true"
+                    class="components-checkbox-control__checked"
+                    focusable="false"
+                    height="24"
+                    role="presentation"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                    />
+                  </svg>
+                </span>
+                <label
+                  class="components-checkbox-control__label"
+                  for="inspector-checkbox-control-1"
+                >
+                  I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                  <a
+                    data-link-type="external"
+                    href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                    target="_blank"
+                  >
+                    Learn more about usage tracking
+                  </a>
+                  .
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "skipFlowBusinessLocation"  via INITIALIZATION_COMPLETE → INTRO_SKIPPED 1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+      >
+        <div
+          class="woocommerce-profiler-intro-opt-in"
+          data-testid="core-profiler-intro-opt-in-screen"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 20%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip guided setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+          >
+            <div
+              class="woocommerce-profiler-welcome-image"
+            />
+            <div
+              class="woocommerce-profiler-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Welcome to Woo!
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+              </h2>
+            </div>
+            <button
+              class="components-button woocommerce-profiler-setup-store__button is-primary"
+              type="button"
+            >
+              Set up my store
+            </button>
+            <div
+              class="woocommerce-profiler-intro-opt-in__footer"
+            >
+              <div
+                class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+              >
+                <div
+                  class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+                >
+                  <span
+                    class="components-checkbox-control__input-container"
+                  >
+                    <input
+                      checked=""
+                      class="components-checkbox-control__input"
+                      id="inspector-checkbox-control-3"
+                      type="checkbox"
+                      value="1"
+                    />
+                    <svg
+                      aria-hidden="true"
+                      class="components-checkbox-control__checked"
+                      focusable="false"
+                      height="24"
+                      role="presentation"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                      />
+                    </svg>
+                  </span>
+                  <label
+                    class="components-checkbox-control__label"
+                    for="inspector-checkbox-control-3"
+                  >
+                    I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                    <a
+                      data-link-type="external"
+                      href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                      target="_blank"
+                    >
+                      Learn more about usage tracking
+                    </a>
+                    .
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+    >
+      <div
+        class="woocommerce-profiler-intro-opt-in"
+        data-testid="core-profiler-intro-opt-in-screen"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 20%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip guided setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+        >
+          <div
+            class="woocommerce-profiler-welcome-image"
+          />
+          <div
+            class="woocommerce-profiler-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Welcome to Woo!
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+            </h2>
+          </div>
+          <button
+            class="components-button woocommerce-profiler-setup-store__button is-primary"
+            type="button"
+          >
+            Set up my store
+          </button>
+          <div
+            class="woocommerce-profiler-intro-opt-in__footer"
+          >
+            <div
+              class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+            >
+              <div
+                class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+              >
+                <span
+                  class="components-checkbox-control__input-container"
+                >
+                  <input
+                    checked=""
+                    class="components-checkbox-control__input"
+                    id="inspector-checkbox-control-3"
+                    type="checkbox"
+                    value="1"
+                  />
+                  <svg
+                    aria-hidden="true"
+                    class="components-checkbox-control__checked"
+                    focusable="false"
+                    height="24"
+                    role="presentation"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                    />
+                  </svg>
+                </span>
+                <label
+                  class="components-checkbox-control__label"
+                  for="inspector-checkbox-control-3"
+                >
+                  I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                  <a
+                    data-link-type="external"
+                    href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                    target="_blank"
+                  >
+                    Learn more about usage tracking
+                  </a>
+                  .
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "skipFlowBusinessLocation"  via INITIALIZATION_COMPLETE → INTRO_SKIPPED 2`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+      >
+        <div
+          class="woocommerce-profiler-intro-opt-in"
+          data-testid="core-profiler-intro-opt-in-screen"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 20%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip guided setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+          >
+            <div
+              class="woocommerce-profiler-welcome-image"
+            />
+            <div
+              class="woocommerce-profiler-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Welcome to Woo!
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+              </h2>
+            </div>
+            <button
+              class="components-button woocommerce-profiler-setup-store__button is-primary"
+              type="button"
+            >
+              Set up my store
+            </button>
+            <div
+              class="woocommerce-profiler-intro-opt-in__footer"
+            >
+              <div
+                class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+              >
+                <div
+                  class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+                >
+                  <span
+                    class="components-checkbox-control__input-container"
+                  >
+                    <input
+                      checked=""
+                      class="components-checkbox-control__input"
+                      id="inspector-checkbox-control-3"
+                      type="checkbox"
+                      value="1"
+                    />
+                    <svg
+                      aria-hidden="true"
+                      class="components-checkbox-control__checked"
+                      focusable="false"
+                      height="24"
+                      role="presentation"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                      />
+                    </svg>
+                  </span>
+                  <label
+                    class="components-checkbox-control__label"
+                    for="inspector-checkbox-control-3"
+                  >
+                    I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                    <a
+                      data-link-type="external"
+                      href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                      target="_blank"
+                    >
+                      Learn more about usage tracking
+                    </a>
+                    .
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+    >
+      <div
+        class="woocommerce-profiler-intro-opt-in"
+        data-testid="core-profiler-intro-opt-in-screen"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 20%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip guided setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+        >
+          <div
+            class="woocommerce-profiler-welcome-image"
+          />
+          <div
+            class="woocommerce-profiler-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Welcome to Woo!
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+            </h2>
+          </div>
+          <button
+            class="components-button woocommerce-profiler-setup-store__button is-primary"
+            type="button"
+          >
+            Set up my store
+          </button>
+          <div
+            class="woocommerce-profiler-intro-opt-in__footer"
+          >
+            <div
+              class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+            >
+              <div
+                class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+              >
+                <span
+                  class="components-checkbox-control__input-container"
+                >
+                  <input
+                    checked=""
+                    class="components-checkbox-control__input"
+                    id="inspector-checkbox-control-3"
+                    type="checkbox"
+                    value="1"
+                  />
+                  <svg
+                    aria-hidden="true"
+                    class="components-checkbox-control__checked"
+                    focusable="false"
+                    height="24"
+                    role="presentation"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                    />
+                  </svg>
+                </span>
+                <label
+                  class="components-checkbox-control__label"
+                  for="inspector-checkbox-control-3"
+                >
+                  I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                  <a
+                    data-link-type="external"
+                    href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                    target="_blank"
+                  >
+                    Learn more about usage tracking
+                  </a>
+                  .
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "skipFlowBusinessLocation"  via INITIALIZATION_COMPLETE → INTRO_SKIPPED 3`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-skipFlowBusinessLocation"
+      >
+        <div
+          class="woocommerce-profiler-business-location"
+          data-testid="core-profiler-business-location"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 80%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-business-location__content"
+          >
+            <div
+              class="woocommerce-profiler-heading woocommerce-profiler__stepper-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Where is your business located?
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                We'll use this information to help you set up payments, shipping, and taxes.
+              </h2>
+            </div>
+            <div>
+              <div
+                class="woocommerce-select-control woocommerce-profiler-select-control__country is-searchable"
+              >
+                <div
+                  class="components-base-control woocommerce-select-control__control empty has-error"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="woocommerce-select-control__control-icon"
+                    focusable="false"
+                    height="24"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"
+                    />
+                  </svg>
+                  <div
+                    class="components-base-control__field"
+                  >
+                    <label
+                      class="components-base-control__label"
+                      for="woocommerce-select-control-0__control-input"
+                    >
+                      Select country/region
+                    </label>
+                    <input
+                      aria-autocomplete="list"
+                      aria-expanded="false"
+                      aria-haspopup="true"
+                      aria-label="Select country/region"
+                      autocomplete="new-password"
+                      class="woocommerce-select-control__control-input"
+                      id="woocommerce-select-control-0__control-input"
+                      placeholder=""
+                      role="combobox"
+                      type="search"
+                      value=""
+                    />
+                    <p
+                      class="components-base-control__help"
+                      id="woocommerce-select-control-0__help"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        focusable="false"
+                        height="24"
+                        viewBox="0 0 24 24"
+                        width="24"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M17.5 11.6L12 16l-5.5-4.4.9-1.2L12 14l4.5-3.6 1 1.2z"
+                        />
+                      </svg>
+                    </p>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-button-container woocommerce-profiler-go-to-mystore__button-container"
+            >
+              <button
+                class="components-button woocommerce-profiler-button is-primary"
+                disabled=""
+                type="button"
+              >
+                Go to my store
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-skipFlowBusinessLocation"
+    >
+      <div
+        class="woocommerce-profiler-business-location"
+        data-testid="core-profiler-business-location"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 80%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            />
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-business-location__content"
+        >
+          <div
+            class="woocommerce-profiler-heading woocommerce-profiler__stepper-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Where is your business located?
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              We'll use this information to help you set up payments, shipping, and taxes.
+            </h2>
+          </div>
+          <div>
+            <div
+              class="woocommerce-select-control woocommerce-profiler-select-control__country is-searchable"
+            >
+              <div
+                class="components-base-control woocommerce-select-control__control empty has-error"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="woocommerce-select-control__control-icon"
+                  focusable="false"
+                  height="24"
+                  viewBox="0 0 24 24"
+                  width="24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"
+                  />
+                </svg>
+                <div
+                  class="components-base-control__field"
+                >
+                  <label
+                    class="components-base-control__label"
+                    for="woocommerce-select-control-0__control-input"
+                  >
+                    Select country/region
+                  </label>
+                  <input
+                    aria-autocomplete="list"
+                    aria-expanded="false"
+                    aria-haspopup="true"
+                    aria-label="Select country/region"
+                    autocomplete="new-password"
+                    class="woocommerce-select-control__control-input"
+                    id="woocommerce-select-control-0__control-input"
+                    placeholder=""
+                    role="combobox"
+                    type="search"
+                    value=""
+                  />
+                  <p
+                    class="components-base-control__help"
+                    id="woocommerce-select-control-0__help"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      focusable="false"
+                      height="24"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M17.5 11.6L12 16l-5.5-4.4.9-1.2L12 14l4.5-3.6 1 1.2z"
+                      />
+                    </svg>
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-button-container woocommerce-profiler-go-to-mystore__button-container"
+          >
+            <button
+              class="components-button woocommerce-profiler-button is-primary"
+              disabled=""
+              type="button"
+            >
+              Go to my store
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "userProfile"  via INITIALIZATION_COMPLETE → INTRO_COMPLETED 1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+      >
+        <div
+          class="woocommerce-profiler-intro-opt-in"
+          data-testid="core-profiler-intro-opt-in-screen"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 20%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip guided setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+          >
+            <div
+              class="woocommerce-profiler-welcome-image"
+            />
+            <div
+              class="woocommerce-profiler-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Welcome to Woo!
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+              </h2>
+            </div>
+            <button
+              class="components-button woocommerce-profiler-setup-store__button is-primary"
+              type="button"
+            >
+              Set up my store
+            </button>
+            <div
+              class="woocommerce-profiler-intro-opt-in__footer"
+            >
+              <div
+                class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+              >
+                <div
+                  class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+                >
+                  <span
+                    class="components-checkbox-control__input-container"
+                  >
+                    <input
+                      checked=""
+                      class="components-checkbox-control__input"
+                      id="inspector-checkbox-control-2"
+                      type="checkbox"
+                      value="1"
+                    />
+                    <svg
+                      aria-hidden="true"
+                      class="components-checkbox-control__checked"
+                      focusable="false"
+                      height="24"
+                      role="presentation"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                      />
+                    </svg>
+                  </span>
+                  <label
+                    class="components-checkbox-control__label"
+                    for="inspector-checkbox-control-2"
+                  >
+                    I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                    <a
+                      data-link-type="external"
+                      href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                      target="_blank"
+                    >
+                      Learn more about usage tracking
+                    </a>
+                    .
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+    >
+      <div
+        class="woocommerce-profiler-intro-opt-in"
+        data-testid="core-profiler-intro-opt-in-screen"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 20%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip guided setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+        >
+          <div
+            class="woocommerce-profiler-welcome-image"
+          />
+          <div
+            class="woocommerce-profiler-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Welcome to Woo!
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+            </h2>
+          </div>
+          <button
+            class="components-button woocommerce-profiler-setup-store__button is-primary"
+            type="button"
+          >
+            Set up my store
+          </button>
+          <div
+            class="woocommerce-profiler-intro-opt-in__footer"
+          >
+            <div
+              class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+            >
+              <div
+                class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+              >
+                <span
+                  class="components-checkbox-control__input-container"
+                >
+                  <input
+                    checked=""
+                    class="components-checkbox-control__input"
+                    id="inspector-checkbox-control-2"
+                    type="checkbox"
+                    value="1"
+                  />
+                  <svg
+                    aria-hidden="true"
+                    class="components-checkbox-control__checked"
+                    focusable="false"
+                    height="24"
+                    role="presentation"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                    />
+                  </svg>
+                </span>
+                <label
+                  class="components-checkbox-control__label"
+                  for="inspector-checkbox-control-2"
+                >
+                  I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                  <a
+                    data-link-type="external"
+                    href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                    target="_blank"
+                  >
+                    Learn more about usage tracking
+                  </a>
+                  .
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "userProfile"  via INITIALIZATION_COMPLETE → INTRO_COMPLETED 2`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+      >
+        <div
+          class="woocommerce-profiler-intro-opt-in"
+          data-testid="core-profiler-intro-opt-in-screen"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 20%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip guided setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+          >
+            <div
+              class="woocommerce-profiler-welcome-image"
+            />
+            <div
+              class="woocommerce-profiler-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Welcome to Woo!
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+              </h2>
+            </div>
+            <button
+              class="components-button woocommerce-profiler-setup-store__button is-primary"
+              type="button"
+            >
+              Set up my store
+            </button>
+            <div
+              class="woocommerce-profiler-intro-opt-in__footer"
+            >
+              <div
+                class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+              >
+                <div
+                  class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+                >
+                  <span
+                    class="components-checkbox-control__input-container"
+                  >
+                    <input
+                      checked=""
+                      class="components-checkbox-control__input"
+                      id="inspector-checkbox-control-2"
+                      type="checkbox"
+                      value="1"
+                    />
+                    <svg
+                      aria-hidden="true"
+                      class="components-checkbox-control__checked"
+                      focusable="false"
+                      height="24"
+                      role="presentation"
+                      viewBox="0 0 24 24"
+                      width="24"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                      />
+                    </svg>
+                  </span>
+                  <label
+                    class="components-checkbox-control__label"
+                    for="inspector-checkbox-control-2"
+                  >
+                    I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                    <a
+                      data-link-type="external"
+                      href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                      target="_blank"
+                    >
+                      Learn more about usage tracking
+                    </a>
+                    .
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-introOptIn"
+    >
+      <div
+        class="woocommerce-profiler-intro-opt-in"
+        data-testid="core-profiler-intro-opt-in-screen"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 20%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip guided setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-intro-opt-in__content"
+        >
+          <div
+            class="woocommerce-profiler-welcome-image"
+          />
+          <div
+            class="woocommerce-profiler-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Welcome to Woo!
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              It's great to have you here with us! We'll be guiding you through the setup process – first, answer a few questions to tailor your experience.
+            </h2>
+          </div>
+          <button
+            class="components-button woocommerce-profiler-setup-store__button is-primary"
+            type="button"
+          >
+            Set up my store
+          </button>
+          <div
+            class="woocommerce-profiler-intro-opt-in__footer"
+          >
+            <div
+              class="components-base-control components-checkbox-control woocommerce-profiler-intro-opt-in__checkbox css-wdf2ti-Wrapper ej5x27r4"
+            >
+              <div
+                class="components-base-control__field css-10urnh1-StyledField-deprecatedMarginField ej5x27r3"
+              >
+                <span
+                  class="components-checkbox-control__input-container"
+                >
+                  <input
+                    checked=""
+                    class="components-checkbox-control__input"
+                    id="inspector-checkbox-control-2"
+                    type="checkbox"
+                    value="1"
+                  />
+                  <svg
+                    aria-hidden="true"
+                    class="components-checkbox-control__checked"
+                    focusable="false"
+                    height="24"
+                    role="presentation"
+                    viewBox="0 0 24 24"
+                    width="24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"
+                    />
+                  </svg>
+                </span>
+                <label
+                  class="components-checkbox-control__label"
+                  for="inspector-checkbox-control-2"
+                >
+                  I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. 
+                  <a
+                    data-link-type="external"
+                    href="https://woocommerce.com/usage-tracking?utm_medium=product"
+                    target="_blank"
+                  >
+                    Learn more about usage tracking
+                  </a>
+                  .
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`All states in CoreProfilerMachine should be reachable reaches state: "userProfile"  via INITIALIZATION_COMPLETE → INTRO_COMPLETED 3`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body
+    class="woocommerce-profile-wizard__body woocommerce-admin-full-screen is-wp-toolbar-disabled"
+  >
+    <p
+      class="a11y-speak-intro-text"
+      hidden="hidden"
+      id="a11y-speak-intro-text"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    >
+      Notifications
+    </p>
+    <div
+      aria-atomic="true"
+      aria-live="assertive"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-assertive"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div
+      aria-atomic="true"
+      aria-live="polite"
+      aria-relevant="additions text"
+      class="a11y-speak-region"
+      id="a11y-speak-polite"
+      style="position: absolute;margin: -1px;padding: 0;height: 1px;width: 1px;overflow: hidden;clip: rect(1px, 1px, 1px, 1px);-webkit-clip-path: inset(50%);clip-path: inset(50%);border: 0;word-wrap: normal !important;"
+    />
+    <div>
+      <div
+        class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-userProfile"
+      >
+        <div
+          class="woocommerce-profiler-user-profile"
+          data-testid="core-profiler-user-profile"
+        >
+          <div
+            class="woocommerce-profiler-navigation-container"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar progress-bar"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__container"
+                style="background-color: transparent;"
+              >
+                <div
+                  class="woocommerce-profiler-progress-bar__filler"
+                  style="width: 40%; display: inherit;"
+                />
+              </div>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation"
+            >
+              <div
+                class="woocommerce-profiler-navigation-col-left"
+              >
+                <span
+                  class="woologo"
+                >
+                  <svg
+                    class="wc-icon wc-icon__woo-logo"
+                    preserveAspectRatio="xMidYMid"
+                    version="1.1"
+                    viewBox="0 0 256 153"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                      fill="#7f54b3"
+                    />
+                    <path
+                      d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                      fill="#fff"
+                    />
+                  </svg>
+                </span>
+              </div>
+              <div
+                class="woocommerce-profiler-navigation-col-right"
+              >
+                <button
+                  class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                  type="button"
+                >
+                  Skip this setup
+                </button>
+              </div>
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-page__content woocommerce-profiler-user-profile__content"
+          >
+            <div
+              class="woocommerce-profiler-heading woocommerce-profiler__stepper-heading"
+            >
+              <h1
+                class="woocommerce-profiler-heading__title"
+              >
+                Which one of these best describes you?
+              </h1>
+              <h2
+                class="woocommerce-profiler-heading__subtitle"
+              >
+                Let us know where you are in your commerce journey so that we can tailor your Woo experience for you.
+              </h2>
+            </div>
+            <form
+              class="woocommerce-user-profile-choices"
+            >
+              <fieldset>
+                <legend
+                  class="screen-reader-text"
+                >
+                  Which one of these best describes you?
+                </legend>
+                <div
+                  class="woocommerce-profiler-choice-container"
+                  data-selected="true"
+                  role="radio"
+                  tabindex="0"
+                >
+                  <div
+                    class="woocommerce-profiler-choice"
+                  >
+                    <input
+                      checked=""
+                      class="woocommerce-profiler-choice-input"
+                      data-selected="true"
+                      id="woocommerce-im-just-starting-my-business"
+                      name="user-profile-choice"
+                      tabindex="-1"
+                      type="radio"
+                      value="im_just_starting_my_business"
+                    />
+                    <label
+                      class="choice__title"
+                      for="woocommerce-im-just-starting-my-business"
+                    >
+                      I'm just starting my business
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="woocommerce-profiler-choice-container"
+                  role="radio"
+                  tabindex="0"
+                >
+                  <div
+                    class="woocommerce-profiler-choice"
+                  >
+                    <input
+                      class="woocommerce-profiler-choice-input"
+                      id="woocommerce-im-already-selling"
+                      name="user-profile-choice"
+                      tabindex="-1"
+                      type="radio"
+                      value="im_already_selling"
+                    />
+                    <label
+                      class="choice__title"
+                      for="woocommerce-im-already-selling"
+                    >
+                      I'm already selling
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="woocommerce-profiler-choice-container"
+                  role="radio"
+                  tabindex="0"
+                >
+                  <div
+                    class="woocommerce-profiler-choice"
+                  >
+                    <input
+                      class="woocommerce-profiler-choice-input"
+                      id="woocommerce-im-setting-up-a-store-for-a-client"
+                      name="user-profile-choice"
+                      tabindex="-1"
+                      type="radio"
+                      value="im_setting_up_a_store_for_a_client"
+                    />
+                    <label
+                      class="choice__title"
+                      for="woocommerce-im-setting-up-a-store-for-a-client"
+                    >
+                      I'm setting up a store for a client
+                    </label>
+                  </div>
+                </div>
+              </fieldset>
+            </form>
+            <div
+              class="woocommerce-profiler-button-container"
+            >
+              <button
+                class="components-button woocommerce-profiler-button is-primary"
+                type="button"
+              >
+                Continue
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="woocommerce-profile-wizard__container woocommerce-profile-wizard__step-userProfile"
+    >
+      <div
+        class="woocommerce-profiler-user-profile"
+        data-testid="core-profiler-user-profile"
+      >
+        <div
+          class="woocommerce-profiler-navigation-container"
+        >
+          <div
+            class="woocommerce-profiler-progress-bar progress-bar"
+          >
+            <div
+              class="woocommerce-profiler-progress-bar__container"
+              style="background-color: transparent;"
+            >
+              <div
+                class="woocommerce-profiler-progress-bar__filler"
+                style="width: 40%; display: inherit;"
+              />
+            </div>
+          </div>
+          <div
+            class="woocommerce-profiler-navigation"
+          >
+            <div
+              class="woocommerce-profiler-navigation-col-left"
+            >
+              <span
+                class="woologo"
+              >
+                <svg
+                  class="wc-icon wc-icon__woo-logo"
+                  preserveAspectRatio="xMidYMid"
+                  version="1.1"
+                  viewBox="0 0 256 153"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="m23.759 0h208.38c13.187 0 23.863 10.675 23.863 23.863v79.542c0 13.187-10.675 23.863-23.863 23.863h-74.727l10.257 25.118-45.109-25.118h-98.695c-13.187 0-23.863-10.675-23.863-23.863v-79.542c-0.10466-13.083 10.571-23.863 23.758-23.863z"
+                    fill="#7f54b3"
+                  />
+                  <path
+                    d="m14.578 21.75c1.4569-1.9772 3.6423-3.0179 6.5561-3.226 5.3073-0.41626 8.3252 2.0813 9.0537 7.4927 3.226 21.75 6.7642 40.169 10.511 55.259l22.79-43.395c2.0813-3.9545 4.6829-6.0358 7.8049-6.2439 4.5789-0.3122 7.3886 2.6016 8.5333 8.7415 2.6016 13.841 5.9317 25.6 9.8862 35.59 2.7057-26.433 7.2846-45.476 13.737-57.236 1.561-2.9138 3.8504-4.3707 6.8683-4.5789 2.3935-0.20813 4.5789 0.52033 6.5561 2.0813 1.9772 1.561 3.0179 3.5382 3.226 5.9317 0.10406 1.8732-0.20813 3.4341-1.0407 4.9951-4.0585 7.4927-7.3886 20.085-10.094 37.567-2.6016 16.963-3.5382 30.179-2.9138 39.649 0.20813 2.6016-0.20813 4.8911-1.2488 6.8683-1.2488 2.2894-3.122 3.5382-5.5154 3.7463-2.7057 0.20813-5.5154-1.0406-8.2211-3.8504-9.678-9.8862-17.379-24.663-22.998-44.332-6.7642 13.32-11.759 23.311-14.985 29.971-6.1398 11.759-11.343 17.795-15.714 18.107-2.8098 0.20813-5.2033-2.1854-7.2846-7.1805-5.3073-13.633-11.031-39.961-17.171-78.985-0.41626-2.7057 0.20813-5.0992 1.665-6.9724zm223.64 16.338c-3.7463-6.5561-9.2618-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0.10406-8.1171-1.665-14.881-4.9951-20.501zm-13.112 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93659-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0 2.7057-0.20813 5.3073-0.72846 7.7008zm-52.033-28.826c-3.7463-6.5561-9.3659-10.511-16.65-12.072-1.9772-0.41626-3.8504-0.62439-5.6195-0.62439-9.9902 0-18.107 5.2033-24.455 15.61-5.4114 8.8455-8.1171 18.628-8.1171 29.346 0 8.013 1.665 14.881 4.9951 20.605 3.7463 6.5561 9.2618 10.511 16.65 12.072 1.9772 0.41626 3.8504 0.62439 5.6195 0.62439 10.094 0 18.211-5.2033 24.455-15.61 5.4114-8.9496 8.1171-18.732 8.1171-29.45 0-8.1171-1.665-14.881-4.9951-20.501zm-13.216 28.826c-1.4569 6.8683-4.0585 11.967-7.9089 15.402-3.0179 2.7057-5.8276 3.8504-8.4293 3.3301-2.4976-0.52033-4.5789-2.7057-6.1398-6.7642-1.2488-3.226-1.8732-6.452-1.8732-9.4699 0-2.6016 0.20813-5.2033 0.72846-7.5967 0.93658-4.2667 2.7057-8.4293 5.5154-12.384 3.4341-5.0992 7.0764-7.1805 10.823-6.452 2.4976 0.52033 4.5789 2.7057 6.1398 6.7642 1.2488 3.226 1.8732 6.452 1.8732 9.4699 0.10406 2.7057-0.20813 5.3073-0.72846 7.7008z"
+                    fill="#fff"
+                  />
+                </svg>
+              </span>
+            </div>
+            <div
+              class="woocommerce-profiler-navigation-col-right"
+            >
+              <button
+                class="components-button woocommerce-profiler-navigation-skip-link is-link"
+                type="button"
+              >
+                Skip this setup
+              </button>
+            </div>
+          </div>
+        </div>
+        <div
+          class="woocommerce-profiler-page__content woocommerce-profiler-user-profile__content"
+        >
+          <div
+            class="woocommerce-profiler-heading woocommerce-profiler__stepper-heading"
+          >
+            <h1
+              class="woocommerce-profiler-heading__title"
+            >
+              Which one of these best describes you?
+            </h1>
+            <h2
+              class="woocommerce-profiler-heading__subtitle"
+            >
+              Let us know where you are in your commerce journey so that we can tailor your Woo experience for you.
+            </h2>
+          </div>
+          <form
+            class="woocommerce-user-profile-choices"
+          >
+            <fieldset>
+              <legend
+                class="screen-reader-text"
+              >
+                Which one of these best describes you?
+              </legend>
+              <div
+                class="woocommerce-profiler-choice-container"
+                data-selected="true"
+                role="radio"
+                tabindex="0"
+              >
+                <div
+                  class="woocommerce-profiler-choice"
+                >
+                  <input
+                    checked=""
+                    class="woocommerce-profiler-choice-input"
+                    data-selected="true"
+                    id="woocommerce-im-just-starting-my-business"
+                    name="user-profile-choice"
+                    tabindex="-1"
+                    type="radio"
+                    value="im_just_starting_my_business"
+                  />
+                  <label
+                    class="choice__title"
+                    for="woocommerce-im-just-starting-my-business"
+                  >
+                    I'm just starting my business
+                  </label>
+                </div>
+              </div>
+              <div
+                class="woocommerce-profiler-choice-container"
+                role="radio"
+                tabindex="0"
+              >
+                <div
+                  class="woocommerce-profiler-choice"
+                >
+                  <input
+                    class="woocommerce-profiler-choice-input"
+                    id="woocommerce-im-already-selling"
+                    name="user-profile-choice"
+                    tabindex="-1"
+                    type="radio"
+                    value="im_already_selling"
+                  />
+                  <label
+                    class="choice__title"
+                    for="woocommerce-im-already-selling"
+                  >
+                    I'm already selling
+                  </label>
+                </div>
+              </div>
+              <div
+                class="woocommerce-profiler-choice-container"
+                role="radio"
+                tabindex="0"
+              >
+                <div
+                  class="woocommerce-profiler-choice"
+                >
+                  <input
+                    class="woocommerce-profiler-choice-input"
+                    id="woocommerce-im-setting-up-a-store-for-a-client"
+                    name="user-profile-choice"
+                    tabindex="-1"
+                    type="radio"
+                    value="im_setting_up_a_store_for_a_client"
+                  />
+                  <label
+                    class="choice__title"
+                    for="woocommerce-im-setting-up-a-store-for-a-client"
+                  >
+                    I'm setting up a store for a client
+                  </label>
+                </div>
+              </div>
+            </fieldset>
+          </form>
+          <div
+            class="woocommerce-profiler-button-container"
+          >
+            <button
+              class="components-button woocommerce-profiler-button is-primary"
+              type="button"
+            >
+              Continue
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
diff --git a/plugins/woocommerce-admin/client/core-profiler/test/core-profiler-machine.test.tsx b/plugins/woocommerce-admin/client/core-profiler/test/core-profiler-machine.test.tsx
new file mode 100644
index 00000000000..d2bcbaa57ca
--- /dev/null
+++ b/plugins/woocommerce-admin/client/core-profiler/test/core-profiler-machine.test.tsx
@@ -0,0 +1,146 @@
+/**
+ * External dependencies
+ */
+import {
+	fireEvent,
+	render,
+	RenderResult,
+	waitFor,
+} from '@testing-library/react';
+import { createModel } from '@xstate/test';
+import { createMachine } from 'xstate';
+/**
+ * Internal dependencies
+ */
+import { CoreProfilerController } from '../';
+
+// mock out the external dependencies which we don't want to test here
+const actionOverrides = {
+	updateTrackingOption: jest.fn(),
+	updateOnboardingProfileOption: jest.fn(),
+	recordTracksIntroCompleted: jest.fn(),
+	recordTracksIntroSkipped: jest.fn(),
+	recordTracksIntroViewed: jest.fn(),
+	recordTracksUserProfileCompleted: jest.fn(),
+	recordTracksUserProfileSkipped: jest.fn(),
+	recordTracksUserProfileViewed: jest.fn(),
+	recordTracksSkipBusinessLocationViewed: jest.fn(),
+	recordTracksSkipBusinessLocationCompleted: jest.fn(),
+	redirectToWooHome: jest.fn(),
+};
+
+const servicesOverrides = {
+	getAllowTrackingOption: jest.fn().mockResolvedValue( 'yes' ),
+	getCountries: jest
+		.fn()
+		.mockResolvedValue( [
+			{ code: 'US', name: 'United States', states: [] },
+		] ),
+	getOnboardingProfileOption: jest.fn().mockResolvedValue( {} ),
+};
+
+/**
+ *  Test model's machine is not the application's model!
+ *  In other words, the events and states don't have to match up.
+ *  We can insert other states to test the pre and post-conditions as well.
+ */
+describe( 'All states in CoreProfilerMachine should be reachable', () => {
+	const testMachine = createMachine( {
+		id: 'coreProfilerTestMachine',
+		initial: 'initializing',
+		predictableActionArguments: true,
+		states: {
+			initializing: {
+				on: {
+					INITIALIZATION_COMPLETE: 'introOptIn',
+				},
+				meta: {
+					test: async ( page: ReturnType< typeof render > ) => {
+						await page.findByTestId(
+							'core-profiler-loading-screen'
+						);
+						expect( page ).toMatchSnapshot();
+					},
+				},
+			},
+			introOptIn: {
+				on: {
+					INTRO_COMPLETED: 'userProfile',
+					INTRO_SKIPPED: 'skipFlowBusinessLocation',
+				},
+				meta: {
+					test: async ( page: ReturnType< typeof render > ) => {
+						expect(
+							await page.findByTestId(
+								'core-profiler-intro-opt-in-screen'
+							)
+						).toBeVisible();
+						expect( page ).toMatchSnapshot();
+					},
+				},
+			},
+			skipFlowBusinessLocation: {
+				meta: {
+					test: async ( page: ReturnType< typeof render > ) => {
+						expect(
+							await page.findByTestId(
+								'core-profiler-business-location'
+							)
+						).toBeVisible();
+						expect( page ).toMatchSnapshot();
+					},
+				},
+			},
+			userProfile: {
+				meta: {
+					test: async ( page: ReturnType< typeof render > ) => {
+						expect(
+							await page.findByTestId(
+								'core-profiler-user-profile'
+							)
+						).toBeVisible();
+						expect( page ).toMatchSnapshot();
+					},
+				},
+			},
+		},
+	} );
+	const coreProfilerMachineModel = createModel( testMachine ).withEvents( {
+		INITIALIZATION_COMPLETE: () => {},
+		INTRO_SKIPPED: async ( page ) => {
+			await fireEvent.click(
+				( page as RenderResult ).getByText( 'Skip guided setup' )
+			);
+		},
+		INTRO_COMPLETED: async ( page ) => {
+			await fireEvent.click(
+				( page as RenderResult ).getByText( 'Set up my store' )
+			);
+		},
+		SKIP_FLOW_BUSINESS_LOCATION: () => {},
+	} );
+	const testPlans = coreProfilerMachineModel.getSimplePathPlans();
+	testPlans.forEach( ( plan ) => {
+		describe( `${ plan.description }`, () => {
+			afterEach( () => jest.clearAllMocks() );
+			plan.paths.forEach( ( path ) => {
+				test( `${ path.description }`, async () => {
+					const rendered = render(
+						<CoreProfilerController
+							actionOverrides={ actionOverrides }
+							servicesOverrides={ servicesOverrides }
+						/>
+					);
+					return waitFor( () => {
+						// waitFor here so that the render settles before we test
+						return path.test( rendered );
+					} );
+				} );
+			} );
+		} );
+	} );
+
+	it( 'coverage', () => {
+		coreProfilerMachineModel.testCoverage();
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/dashboard/default-sections.js b/plugins/woocommerce-admin/client/dashboard/default-sections.js
index 4f01bbbb1ab..b7176e586ff 100644
--- a/plugins/woocommerce-admin/client/dashboard/default-sections.js
+++ b/plugins/woocommerce-admin/client/dashboard/default-sections.js
@@ -48,7 +48,7 @@ const DEFAULT_SECTIONS_FILTER = 'woocommerce_dashboard_default_sections';
  * @property {string}         key          Unique identifying string.
  * @property {Node}           component    React component to render.
  * @property {string}         title        Title.
- * @property {boolean}        isVisible    The default visibilty.
+ * @property {boolean}        isVisible    The default visibility.
  * @property {Node}           icon         Section icon.
  * @property {Array.<string>} hiddenBlocks Blocks that are hidden by default.
  */
diff --git a/plugins/woocommerce-admin/client/dashboard/utils.js b/plugins/woocommerce-admin/client/dashboard/utils.ts
similarity index 78%
rename from plugins/woocommerce-admin/client/dashboard/utils.js
rename to plugins/woocommerce-admin/client/dashboard/utils.ts
index 26ae5b3821c..7bd0fe18a09 100644
--- a/plugins/woocommerce-admin/client/dashboard/utils.js
+++ b/plugins/woocommerce-admin/client/dashboard/utils.ts
@@ -3,6 +3,11 @@
  */
 import { decodeEntities } from '@wordpress/html-entities';
 import { without } from 'lodash';
+import {
+	OnboardingProductType,
+	OnboardingProductTypes,
+	ProfileItems,
+} from '@woocommerce/data';
 
 /**
  * Internal dependencies
@@ -24,19 +29,68 @@ export function getCountryCode( countryState = '' ) {
 	return countryState.split( ':' )[ 0 ];
 }
 
-export function getCurrencyRegion( countryState ) {
+export function getCurrencyRegion( countryState: string ) {
 	let region = getCountryCode( countryState );
 	const euCountries = without(
 		getAdminSetting( 'onboarding', { euCountries: [] } ).euCountries,
 		'GB'
 	);
-	if ( euCountries.includes( region ) ) {
+	if ( region !== null && euCountries.includes( region ) ) {
 		region = 'EU';
 	}
 
 	return region;
 }
 
+/**
+ * Get the value of a price from a string, removing any non-numeric characters.
+ *
+ * @param {string} string Price string.
+ * @return {number} Number value.
+ */
+export function getPriceValue( string: string ) {
+	return Number( decodeEntities( string ).replace( /[^0-9.-]+/g, '' ) );
+}
+
+/**
+ * Gets a product list for items based on the product types and theme selected in the onboarding profiler.
+ *
+ * @param {Object}  profileItems          Onboarding profile.
+ * @param {boolean} includeInstalledItems Include installed items in returned product list.
+ * @param {Array}   installedPlugins      Installed plugins.
+ * @param {Object}  productTypes          Product Types.
+ * @return {Array} Products.
+ */
+export function getProductList(
+	profileItems: ProfileItems,
+	includeInstalledItems = false,
+	installedPlugins: string[],
+	productTypes: OnboardingProductTypes
+) {
+	const productList: OnboardingProductType[] = [];
+
+	if ( ! productTypes ) {
+		return productList;
+	}
+
+	const profileItemsProductTypes = profileItems.product_types || [];
+
+	profileItemsProductTypes.forEach( ( productType ) => {
+		if (
+			productTypes[ productType ] &&
+			productTypes[ productType ].product &&
+			( includeInstalledItems ||
+				! installedPlugins.includes(
+					productTypes[ productType ].slug as string
+				) )
+		) {
+			productList.push( productTypes[ productType ] );
+		}
+	} );
+
+	return productList;
+}
+
 /**
  * Gets the product IDs for items based on the product types and theme selected in the onboarding profiler.
  *
@@ -47,10 +101,10 @@ export function getCurrencyRegion( countryState ) {
  * @return {Array} Product Ids.
  */
 export function getProductIdsForCart(
-	productTypes,
-	profileItems,
+	productTypes: OnboardingProductTypes,
+	profileItems: ProfileItems,
 	includeInstalledItems = false,
-	installedPlugins
+	installedPlugins: string[]
 ) {
 	const productList = getProductList(
 		profileItems,
@@ -73,32 +127,25 @@ export function getProductIdsForCart(
  * @return {Array} Objects with labeled/categorized product names and types.
  */
 export function getCategorizedOnboardingProducts(
-	productTypes,
-	profileItems,
-	installedPlugins
+	productTypes: OnboardingProductTypes,
+	profileItems: ProfileItems,
+	installedPlugins: string[]
 ) {
-	const productList = {};
-	productList.products = getProductList(
+	const products = getProductList(
 		profileItems,
 		true,
 		installedPlugins,
 		productTypes
 	);
-	productList.remainingProducts = getProductList(
+	const remainingProducts = getProductList(
 		profileItems,
 		false,
 		installedPlugins,
 		productTypes
 	);
 
-	const uniqueItemsList = [
-		...new Set( [
-			...productList.products,
-			...productList.remainingProducts,
-		] ),
-	];
-
-	productList.uniqueItemsList = uniqueItemsList.map( ( product ) => {
+	const productSets = [ ...new Set( [ ...products, ...remainingProducts ] ) ];
+	const uniqueItemsList = productSets.map( ( product ) => {
 		let cleanedProduct;
 		if ( product.label ) {
 			cleanedProduct = { type: 'extension', name: product.label };
@@ -108,54 +155,9 @@ export function getCategorizedOnboardingProducts(
 		return cleanedProduct;
 	} );
 
-	return productList;
-}
-
-/**
- * Gets a product list for items based on the product types and theme selected in the onboarding profiler.
- *
- * @param {Object}  profileItems          Onboarding profile.
- * @param {boolean} includeInstalledItems Include installed items in returned product list.
- * @param {Array}   installedPlugins      Installed plugins.
- * @param {Object}  productTypes          Product Types.
- * @return {Array} Products.
- */
-export function getProductList(
-	profileItems,
-	includeInstalledItems = false,
-	installedPlugins,
-	productTypes
-) {
-	const productList = [];
-
-	if ( ! productTypes ) {
-		return productList;
-	}
-
-	const profileItemsProductTypes = profileItems.product_types || [];
-
-	profileItemsProductTypes.forEach( ( productType ) => {
-		if (
-			productTypes[ productType ] &&
-			productTypes[ productType ].product &&
-			( includeInstalledItems ||
-				! installedPlugins.includes(
-					productTypes[ productType ].slug
-				) )
-		) {
-			productList.push( productTypes[ productType ] );
-		}
-	} );
-
-	return productList;
-}
-
-/**
- * Get the value of a price from a string, removing any non-numeric characters.
- *
- * @param {string} string Price string.
- * @return {number} Number value.
- */
-export function getPriceValue( string ) {
-	return Number( decodeEntities( string ).replace( /[^0-9.-]+/g, '' ) );
+	return {
+		products,
+		remainingProducts,
+		uniqueItemsList,
+	};
 }
diff --git a/plugins/woocommerce-admin/client/embedded-body-layout/embedded-body-layout.tsx b/plugins/woocommerce-admin/client/embedded-body-layout/embedded-body-layout.tsx
index 996490e3927..4a69d546df7 100644
--- a/plugins/woocommerce-admin/client/embedded-body-layout/embedded-body-layout.tsx
+++ b/plugins/woocommerce-admin/client/embedded-body-layout/embedded-body-layout.tsx
@@ -4,7 +4,10 @@
 import { applyFilters } from '@wordpress/hooks';
 import { useEffect } from '@wordpress/element';
 import { triggerExitPageCesSurvey } from '@woocommerce/customer-effort-score';
-import QueryString, { parse } from 'qs';
+import {
+	LayoutContextProvider,
+	getLayoutContextValue,
+} from '@woocommerce/admin-layout';
 
 /**
  * Internal dependencies
@@ -17,10 +20,8 @@ import './style.scss';
 
 type QueryParams = EmbeddedBodyProps;
 
-function isWPPage(
-	params: QueryParams | QueryString.ParsedQs
-): params is QueryParams {
-	return ( params as QueryParams ).page !== undefined;
+function isWPPage( params: URLSearchParams ): boolean {
+	return params.get( 'page' ) !== null;
 }
 
 const EMBEDDED_BODY_COMPONENT_LIST: React.ElementType[] = [
@@ -40,10 +41,10 @@ export const EmbeddedBodyLayout = () => {
 		triggerExitPageCesSurvey();
 	}, [] );
 
-	const query = parse( location.search.substring( 1 ) );
+	const query = new URLSearchParams( location.search );
 	let queryParams: QueryParams = { page: '', tab: '' };
 	if ( isWPPage( query ) ) {
-		queryParams = query;
+		queryParams = Object.fromEntries( query ) as QueryParams;
 	}
 	/**
 	 * Filter an array of body components for WooCommerce non-react pages.
@@ -59,13 +60,15 @@ export const EmbeddedBodyLayout = () => {
 	) as React.ElementType< EmbeddedBodyProps >[];
 
 	return (
-		<div
-			className="woocommerce-embedded-layout__primary"
-			id="woocommerce-embedded-layout__primary"
-		>
-			{ componentList.map( ( Comp, index ) => {
-				return <Comp key={ index } { ...queryParams } />;
-			} ) }
-		</div>
+		<LayoutContextProvider value={ getLayoutContextValue( [ 'page' ] ) }>
+			<div
+				className="woocommerce-embedded-layout__primary"
+				id="woocommerce-embedded-layout__primary"
+			>
+				{ componentList.map( ( Comp, index ) => {
+					return <Comp key={ index } { ...queryParams } />;
+				} ) }
+			</div>
+		</LayoutContextProvider>
 	);
 };
diff --git a/plugins/woocommerce-admin/client/guided-tours/add-product-tour/index.tsx b/plugins/woocommerce-admin/client/guided-tours/add-product-tour/index.tsx
index d487cb93141..361b54095a7 100644
--- a/plugins/woocommerce-admin/client/guided-tours/add-product-tour/index.tsx
+++ b/plugins/woocommerce-admin/client/guided-tours/add-product-tour/index.tsx
@@ -5,7 +5,6 @@ import { useEffect, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { TourKit, TourKitTypes } from '@woocommerce/components';
 import { recordEvent } from '@woocommerce/tracks';
-import qs from 'qs';
 
 /**
  * Internal dependencies
@@ -114,7 +113,7 @@ const getTourConfig = ( {
 					),
 					descriptions: {
 						desktop: __(
-							'Start typing your new product name here. Add your full product description here. Describe your product in detail.',
+							'Add your full product description here. Describe your product in detail.',
 							'woocommerce'
 						),
 					},
@@ -294,7 +293,9 @@ export const ProductTour = () => {
 			recordEvent( 'walkthrough_product_enable_button_click' );
 		} );
 
-		const query = qs.parse( window.location.search.slice( 1 ) );
+		const query = Object.fromEntries(
+			new URLSearchParams( window.location.search )
+		);
 		if ( query && query.tutorial === 'true' ) {
 			const intervalId = waitUntilElementTopNotChange(
 				tourConfig.steps[ 0 ].referenceElements?.desktop || '',
diff --git a/plugins/woocommerce-admin/client/guided-tours/shipping-tour.tsx b/plugins/woocommerce-admin/client/guided-tours/shipping-tour.tsx
index 0a45234d301..769ca692158 100644
--- a/plugins/woocommerce-admin/client/guided-tours/shipping-tour.tsx
+++ b/plugins/woocommerce-admin/client/guided-tours/shipping-tour.tsx
@@ -205,6 +205,7 @@ export const ShippingTour: React.FC< {
 	const { updateOptions } = useDispatch( OPTIONS_STORE_NAME );
 	const { show: showTour } = useShowShippingTour();
 	const [ step, setStepNumber ] = useState( 0 );
+	const { createNotice } = useDispatch( 'core/notices' );
 
 	const tourConfig: TourKitTypes.WooConfig = {
 		placement: 'auto',
@@ -282,10 +283,24 @@ export const ShippingTour: React.FC< {
 				},
 			},
 		],
-		closeHandler: ( steps, stepIndex, source ) => {
-			updateOptions( {
+		closeHandler: async ( steps, stepIndex, source ) => {
+			const update = await updateOptions( {
 				[ REVIEWED_DEFAULTS_OPTION ]: 'yes',
 			} );
+
+			if ( ! update.success ) {
+				createNotice(
+					'error',
+					__(
+						'There was a problem marking the shipping tour as completed.',
+						'woocommerce'
+					)
+				);
+				recordEvent(
+					'walkthrough_settings_shipping_updated_option_error'
+				);
+			}
+
 			if ( source === 'close-btn' ) {
 				recordEvent( 'walkthrough_settings_shipping_dismissed', {
 					step_name: steps[ stepIndex ].meta.name,
diff --git a/plugins/woocommerce-admin/client/guided-tours/wc-addons-tour/index.tsx b/plugins/woocommerce-admin/client/guided-tours/wc-addons-tour/index.tsx
index fec151af83f..a8e310c7566 100644
--- a/plugins/woocommerce-admin/client/guided-tours/wc-addons-tour/index.tsx
+++ b/plugins/woocommerce-admin/client/guided-tours/wc-addons-tour/index.tsx
@@ -6,7 +6,6 @@ import { TourKit, TourKitTypes } from '@woocommerce/components';
 import { recordEvent } from '@woocommerce/tracks';
 import { useDispatch } from '@wordpress/data';
 import { OPTIONS_STORE_NAME } from '@woocommerce/data';
-import qs from 'qs';
 
 /**
  * Internal dependencies
@@ -25,8 +24,8 @@ const WCAddonsTour = () => {
 	const defaultAutoScrollBlock: ScrollLogicalPosition = 'center';
 
 	useEffect( () => {
-		const query = qs.parse( window.location.search.slice( 1 ) );
-		if ( query?.tutorial === 'true' ) {
+		const query = new URLSearchParams( location.search );
+		if ( query.get( 'tutorial' ) === 'true' ) {
 			const intervalId = waitUntilElementTopNotChange(
 				steps[ 0 ].referenceElements?.desktop || '',
 				() => {
diff --git a/plugins/woocommerce-admin/client/header/index.js b/plugins/woocommerce-admin/client/header/index.js
index 5bd466f6492..026c4c28675 100644
--- a/plugins/woocommerce-admin/client/header/index.js
+++ b/plugins/woocommerce-admin/client/header/index.js
@@ -20,7 +20,7 @@ import { Text, useSlot } from '@woocommerce/experimental';
  */
 import './style.scss';
 import useIsScrolled from '../hooks/useIsScrolled';
-import { TasksReminderBar, useActiveSetupTasklist } from '../tasks';
+import { TasksReminderBar, useActiveSetupTasklist } from '../task-lists';
 
 export const PAGE_TITLE_FILTER = 'woocommerce_admin_header_page_title';
 
diff --git a/plugins/woocommerce-admin/client/homescreen/activity-panel/orders/test/index.js b/plugins/woocommerce-admin/client/homescreen/activity-panel/orders/test/index.js
index 400fd32742e..0dfee121297 100644
--- a/plugins/woocommerce-admin/client/homescreen/activity-panel/orders/test/index.js
+++ b/plugins/woocommerce-admin/client/homescreen/activity-panel/orders/test/index.js
@@ -3,6 +3,8 @@
  */
 import { render, screen } from '@testing-library/react';
 import { useSelect } from '@wordpress/data';
+import userEvent from '@testing-library/user-event';
+import { recordEvent } from '@woocommerce/tracks';
 
 /**
  * Internal dependencies
@@ -32,4 +34,25 @@ describe( 'OrdersPanel', () => {
 			screen.queryByText( 'You’ve fulfilled all your orders' )
 		).toBeInTheDocument();
 	} );
+	it( 'should record activity_panel_orders_orders_begin_fulfillment Tracks event when order is clicked', () => {
+		useSelect.mockReturnValue( {
+			orders: [
+				{
+					total: 123,
+					id: 1,
+					number: 1,
+				},
+			],
+			isError: false,
+			isRequesting: false,
+		} );
+		const { getByText } = render(
+			<OrdersPanel orderStatuses={ [] } unreadOrdersCount={ 1 } />
+		);
+		userEvent.click( getByText( '0 products' ) );
+		expect( recordEvent ).toHaveBeenCalledWith(
+			'activity_panel_orders_orders_begin_fulfillment',
+			{}
+		);
+	} );
 } );
diff --git a/plugins/woocommerce-admin/client/homescreen/activity-panel/stock/test/index.js b/plugins/woocommerce-admin/client/homescreen/activity-panel/stock/test/index.js
index cde5e2b2939..81b5dc11bc9 100644
--- a/plugins/woocommerce-admin/client/homescreen/activity-panel/stock/test/index.js
+++ b/plugins/woocommerce-admin/client/homescreen/activity-panel/stock/test/index.js
@@ -4,6 +4,7 @@
 import { render, fireEvent, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { createElement } from '@wordpress/element';
+import { recordEvent } from '@woocommerce/tracks';
 
 /**
  * Internal dependencies
@@ -62,4 +63,34 @@ describe( 'StockPanel', () => {
 			expect( invalidateResolution ).toHaveBeenCalled();
 		} );
 	} );
+	it( 'should record activity_panel_stock_update_stock Tracks event when Update stock is clicked', async () => {
+		const createNotice = jest.fn();
+		const invalidateResolution = jest.fn();
+		const updateProductStock = jest.fn().mockResolvedValue( true );
+
+		const { getByRole } = render(
+			<StockPanel
+				lowStockProductsCount={ 1 }
+				isError={ false }
+				isRequesting={ false }
+				products={ [
+					{
+						id: 1,
+						name: 'Test Product',
+						low_stock_amount: 5,
+						stock_quantity: 1,
+						type: 'simple',
+					},
+				] }
+				invalidateResolution={ invalidateResolution }
+				updateProductStock={ updateProductStock }
+				createNotice={ createNotice }
+			/>
+		);
+		userEvent.click( getByRole( 'button', { name: 'Update stock' } ) );
+		expect( recordEvent ).toHaveBeenCalledWith(
+			'activity_panel_stock_update_stock',
+			{}
+		);
+	} );
 } );
diff --git a/plugins/woocommerce-admin/client/homescreen/activity-panel/test/index.js b/plugins/woocommerce-admin/client/homescreen/activity-panel/test/index.js
index 28334d10f52..b71d85e3701 100644
--- a/plugins/woocommerce-admin/client/homescreen/activity-panel/test/index.js
+++ b/plugins/woocommerce-admin/client/homescreen/activity-panel/test/index.js
@@ -2,7 +2,9 @@
  * External dependencies
  */
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { useSelect } from '@wordpress/data';
+import { recordEvent } from '@woocommerce/tracks';
 
 /**
  * Internal dependencies
@@ -84,4 +86,15 @@ describe( 'ActivityPanel', () => {
 		expect( screen.queryByText( 'custom-panel-1' ) ).toBeNull();
 		expect( screen.queryByText( 'custom-panel-2' ) ).toBeNull();
 	} );
+
+	it( 'should record activity_panel_open Tracks event when panel is opened', () => {
+		useSelect.mockReturnValue( {
+			isTaskListHidden: false,
+		} );
+		const { getByText } = render( <ActivityPanel /> );
+		userEvent.click( getByText( 'custom-panel-2' ) );
+		expect( recordEvent ).toHaveBeenCalledWith( 'activity_panel_open', {
+			tab: 'custom-panel-2',
+		} );
+	} );
 } );
diff --git a/plugins/woocommerce-admin/client/homescreen/layout.js b/plugins/woocommerce-admin/client/homescreen/layout.js
index 7901abc089a..6a0a25b0896 100644
--- a/plugins/woocommerce-admin/client/homescreen/layout.js
+++ b/plugins/woocommerce-admin/client/homescreen/layout.js
@@ -30,7 +30,11 @@ import InboxPanel from '../inbox-panel';
 import { IntroModal as NavigationIntroModal } from '../navigation/components/intro-modal';
 import StatsOverview from './stats-overview';
 import { StoreManagementLinks } from '../store-management-links';
-import { TasksPlaceholder, useActiveSetupTasklist } from '../tasks';
+import {
+	TasksPlaceholder,
+	useActiveSetupTasklist,
+	ProgressTitle,
+} from '../task-lists';
 import {
 	WELCOME_MODAL_DISMISSED_OPTION_NAME,
 	WELCOME_FROM_CALYPSO_MODAL_DISMISSED_OPTION_NAME,
@@ -41,14 +45,15 @@ import { MobileAppModal } from './mobile-app-modal';
 import './style.scss';
 import '../dashboard/style.scss';
 import { getAdminSetting } from '~/utils/admin-settings';
-import { ProgressTitle } from '../task-lists';
 import { WooHomescreenHeaderBanner } from './header-banner-slot';
 import { WooHomescreenWCPayFeature } from './wcpay-feature-slot';
 
-const Tasks = lazy( () =>
-	import( /* webpackChunkName: "tasks" */ '../tasks' ).then( ( module ) => ( {
-		default: module.Tasks,
-	} ) )
+const TaskLists = lazy( () =>
+	import( /* webpackChunkName: "tasks" */ '../task-lists' ).then(
+		( module ) => ( {
+			default: module.TaskLists,
+		} )
+	)
 );
 
 export const Layout = ( {
@@ -127,7 +132,7 @@ export const Layout = ( {
 						<ProgressTitle taskListId={ activeSetupTaskList } />
 					</>
 				) }
-				<Tasks query={ query } />
+				<TaskLists query={ query } />
 			</Suspense>
 		);
 	};
diff --git a/plugins/woocommerce-admin/client/homescreen/mobile-app-modal/components/useSendMagicLink.tsx b/plugins/woocommerce-admin/client/homescreen/mobile-app-modal/components/useSendMagicLink.tsx
index 01671226428..5eebbdb4964 100644
--- a/plugins/woocommerce-admin/client/homescreen/mobile-app-modal/components/useSendMagicLink.tsx
+++ b/plugins/woocommerce-admin/client/homescreen/mobile-app-modal/components/useSendMagicLink.tsx
@@ -47,7 +47,7 @@ export const useSendMagicLink = () => {
 					setRequestState( SendMagicLinkStates.ERROR );
 					createNotice(
 						'error',
-						__( 'Sorry, an unknown error occured.', 'woocommerce' )
+						__( 'Sorry, an unknown error occurred.', 'woocommerce' )
 					);
 				}
 			} )
diff --git a/plugins/woocommerce-admin/client/inbox-panel/test/index.js b/plugins/woocommerce-admin/client/inbox-panel/test/index.js
index 111856b8d01..c26bbecf821 100644
--- a/plugins/woocommerce-admin/client/inbox-panel/test/index.js
+++ b/plugins/woocommerce-admin/client/inbox-panel/test/index.js
@@ -4,6 +4,9 @@
 import { render } from '@testing-library/react';
 import { useSelect } from '@wordpress/data';
 import { recordEvent } from '@woocommerce/tracks';
+import { useEffect } from 'react';
+import { InboxNoteCard } from '@woocommerce/experimental';
+import userEvent from '@testing-library/user-event';
 
 /**
  * Internal dependencies
@@ -22,15 +25,30 @@ jest.mock( '@wordpress/data', () => {
 	};
 } );
 
-jest.mock( '@woocommerce/tracks', () => ( { recordEvent: jest.fn() } ) );
+jest.mock( '@woocommerce/experimental', () => {
+	// Require the original module to not be mocked...
+	const originalModule = jest.requireActual( '@woocommerce/experimental' );
 
-const notes = [
+	return {
+		__esModule: true, // Use it when dealing with esModules
+		...originalModule,
+		InboxNoteCard: jest.fn().mockImplementation( ( { note } ) => {
+			return <div>{ note.id }</div>;
+		} ),
+	};
+} );
+
+const NOTES = [
 	{
 		id: 1,
 		date_created_gmt: '2019-05-10T16:57:31',
 		is_deleted: false,
 		status: 'unactioned',
 		actions: [],
+		content: 'content1',
+		name: 'name1',
+		title: 'title1',
+		type: 'type1',
 	},
 	{
 		id: 2,
@@ -38,6 +56,10 @@ const notes = [
 		is_deleted: false,
 		status: 'unactioned',
 		actions: [],
+		content: 'content2',
+		name: 'name2',
+		title: 'title2',
+		type: 'type2',
 	},
 	{
 		id: 3,
@@ -45,6 +67,10 @@ const notes = [
 		is_deleted: false,
 		status: 'unactioned',
 		actions: [],
+		content: 'content3',
+		name: 'name3',
+		title: 'title3',
+		type: 'type3',
 	},
 	{
 		id: 4,
@@ -52,6 +78,10 @@ const notes = [
 		is_deleted: false,
 		status: 'unactioned',
 		actions: [],
+		content: 'content4',
+		name: 'name4',
+		title: 'title4',
+		type: 'type4',
 	},
 	{
 		id: 5,
@@ -59,6 +89,10 @@ const notes = [
 		is_deleted: false,
 		status: 'unactioned',
 		actions: [],
+		content: 'content5',
+		name: 'name5',
+		title: 'title5',
+		type: 'type5',
 	},
 ];
 
@@ -66,30 +100,54 @@ describe( 'getUnreadNotesCount', () => {
 	const lastRead = 1589285995243;
 
 	test( 'should return 4, 1 of the notes was read', () => {
-		const unreadCount = getUnreadNotesCount( notes, lastRead );
+		const unreadCount = getUnreadNotesCount( NOTES, lastRead );
 		expect( unreadCount ).toEqual( 4 );
 	} );
 
 	test( 'should return 3, 1 of the notes was read and 1 is deleted', () => {
-		notes[ 3 ].is_deleted = true;
+		const notes = [
+			{ ...NOTES[ 0 ] },
+			{ ...NOTES[ 1 ] },
+			{ ...NOTES[ 2 ] },
+			{ ...NOTES[ 3 ], is_deleted: true },
+			{ ...NOTES[ 4 ] },
+		];
 		const unreadCount = getUnreadNotesCount( notes, lastRead );
 		expect( unreadCount ).toEqual( 3 );
 	} );
 
 	test( 'should return 2, 2 of the notes were read and 1 is deleted', () => {
-		notes[ 1 ].date_created_gmt = '2020-05-05T16:57:31';
+		const notes = [
+			{ ...NOTES[ 0 ] },
+			{ ...NOTES[ 1 ], date_created_gmt: '2020-05-05T16:57:31' },
+			{ ...NOTES[ 2 ] },
+			{ ...NOTES[ 3 ], is_deleted: true },
+			{ ...NOTES[ 4 ] },
+		];
 		const unreadCount = getUnreadNotesCount( notes, lastRead );
 		expect( unreadCount ).toEqual( 2 );
 	} );
 
 	test( 'should return 1, 2 of the notes were read, 1 was actioned and 1 is deleted', () => {
-		notes[ 4 ].status = 'actioned';
+		const notes = [
+			{ ...NOTES[ 0 ] },
+			{ ...NOTES[ 1 ], date_created_gmt: '2020-05-05T16:57:31' },
+			{ ...NOTES[ 2 ] },
+			{ ...NOTES[ 3 ], is_deleted: true },
+			{ ...NOTES[ 4 ], status: 'actioned' },
+		];
 		const unreadCount = getUnreadNotesCount( notes, lastRead );
 		expect( unreadCount ).toEqual( 1 );
 	} );
 
 	test( 'should return 0, 2 of the notes were read and 2 are deleted', () => {
-		notes[ 2 ].is_deleted = true;
+		const notes = [
+			{ ...NOTES[ 0 ] },
+			{ ...NOTES[ 1 ], date_created_gmt: '2020-05-05T16:57:31' },
+			{ ...NOTES[ 2 ], is_deleted: true },
+			{ ...NOTES[ 3 ], is_deleted: true },
+			{ ...NOTES[ 4 ], status: 'actioned' },
+		];
 		const unreadCount = getUnreadNotesCount( notes, lastRead );
 		expect( unreadCount ).toEqual( 0 );
 	} );
@@ -97,19 +155,34 @@ describe( 'getUnreadNotesCount', () => {
 
 describe( 'hasValidNotes', () => {
 	test( 'should return true, 2 notes are deleted', () => {
+		const notes = [
+			{ ...NOTES[ 0 ] },
+			{ ...NOTES[ 1 ] },
+			{ ...NOTES[ 2 ], is_deleted: true },
+			{ ...NOTES[ 3 ], is_deleted: true },
+			{ ...NOTES[ 4 ] },
+		];
 		expect( hasValidNotes( notes ) ).toBeTruthy();
 	} );
-	test( 'should return false, 4 notes are deleted', () => {
-		notes[ 0 ].is_deleted = true;
-		notes[ 3 ].is_deleted = true;
-		expect( hasValidNotes( notes ) ).toBeTruthy();
+	test( 'should return false, all notes are deleted', () => {
+		const notes = [
+			{ ...NOTES[ 0 ], is_deleted: true },
+			{
+				...NOTES[ 1 ],
+				is_deleted: true,
+			},
+			{ ...NOTES[ 2 ], is_deleted: true },
+			{ ...NOTES[ 3 ], is_deleted: true },
+			{ ...NOTES[ 4 ], is_deleted: true },
+		];
+		expect( hasValidNotes( notes ) ).toBeFalsy();
 	} );
 } );
 
 describe( 'inbox_panel_view_event', () => {
 	test( 'should fire when panel rendered', () => {
 		useSelect.mockImplementation( () => ( {
-			notes,
+			notes: NOTES,
 			isError: false,
 			notesHaveResolved: true,
 			isBatchUpdating: false,
@@ -121,3 +194,54 @@ describe( 'inbox_panel_view_event', () => {
 		} );
 	} );
 } );
+
+describe( 'inbox_note_view event', () => {
+	test( 'should fire when inbox note card calls onNoteVisible', () => {
+		useSelect.mockImplementation( () => ( {
+			notes: NOTES,
+			isError: false,
+			notesHaveResolved: true,
+			isBatchUpdating: false,
+		} ) );
+		// The original InboxNotecard has a VisibilityDetector so I prefered to mock it and always call onNoteVisible
+		InboxNoteCard.mockImplementation( ( { onNoteVisible, note } ) => {
+			useEffect( () => onNoteVisible( note ), [] );
+			return <div>{ note.id }</div>;
+		} );
+		render( <InboxPanel /> );
+
+		expect( recordEvent ).toHaveBeenCalledWith( 'inbox_note_view', {
+			note_content: NOTES[ 0 ].content,
+			note_name: NOTES[ 0 ].name,
+			note_title: NOTES[ 0 ].title,
+			note_type: NOTES[ 0 ].type,
+			screen: '',
+		} );
+	} );
+} );
+
+describe( 'inbox_action_click event', () => {
+	test( 'should fire tracks event when inboxNoteCard fires onBodyLinkClick', () => {
+		useSelect.mockImplementation( () => ( {
+			notes: NOTES,
+			isError: false,
+			notesHaveResolved: true,
+			isBatchUpdating: false,
+		} ) );
+		InboxNoteCard.mockImplementation( ( { onBodyLinkClick, note } ) => {
+			return (
+				<button onClick={ () => onBodyLinkClick( note, 'innerLink' ) }>
+					Trigger action
+				</button>
+			);
+		} );
+		const { getAllByText } = render( <InboxPanel /> );
+		const buttons = getAllByText( 'Trigger action' );
+		userEvent.click( buttons[ 0 ] );
+		expect( recordEvent ).toHaveBeenCalledWith( 'inbox_action_click', {
+			note_name: NOTES[ 0 ].name,
+			note_title: NOTES[ 0 ].title,
+			note_content_inner_link: 'innerLink',
+		} );
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/layout/controller.js b/plugins/woocommerce-admin/client/layout/controller.js
index 951ca12b227..7beec7fa94a 100644
--- a/plugins/woocommerce-admin/client/layout/controller.js
+++ b/plugins/woocommerce-admin/client/layout/controller.js
@@ -3,7 +3,6 @@
  */
 import { Suspense, lazy } from '@wordpress/element';
 import { useRef, useEffect } from 'react';
-import { parse, stringify } from 'qs';
 import { find, isEqual, last, omit } from 'lodash';
 import { applyFilters } from '@wordpress/hooks';
 import { __ } from '@wordpress/i18n';
@@ -22,18 +21,19 @@ import { Spinner } from '@woocommerce/components';
  */
 import getReports from '../analytics/report/get-reports';
 import { getAdminSetting } from '~/utils/admin-settings';
+import { isFeatureEnabled } from '~/utils/features';
 import { NoMatch } from './NoMatch';
 
+const AddProductPage = lazy( () =>
+	import(
+		/* webpackChunkName: "edit-product-page" */ '../products/add-product-page'
+	)
+);
 const EditProductPage = lazy( () =>
 	import(
 		/* webpackChunkName: "edit-product-page" */ '../products/edit-product-page'
 	)
 );
-const AddProductPage = lazy( () =>
-	import(
-		/* webpackChunkName: "add-product-page" */ '../products/add-product-page'
-	)
-);
 const ProductPage = lazy( () =>
 	import( /* webpackChunkName: "product-page" */ '../products/product-page' )
 );
@@ -172,9 +172,18 @@ export const getPages = () => {
 		} );
 	}
 
-	if ( window.wcAdminFeatures[ 'product-block-editor' ] ) {
-		pages.push( {
+	if ( isFeatureEnabled( 'product_block_editor' ) ) {
+		const productPage = {
 			container: ProductPage,
+			layout: {
+				header: false,
+			},
+			wpOpenMenu: 'menu-posts-product',
+			capability: 'manage_woocommerce',
+		};
+
+		pages.push( {
+			...productPage,
 			path: '/add-product',
 			breadcrumbs: [
 				[ '/add-product', __( 'Product', 'woocommerce' ) ],
@@ -183,12 +192,10 @@ export const getPages = () => {
 			navArgs: {
 				id: 'woocommerce-add-product',
 			},
-			wpOpenMenu: 'menu-posts-product',
-			capability: 'manage_woocommerce',
 		} );
 
 		pages.push( {
-			container: ProductPage,
+			...productPage,
 			path: '/product/:productId',
 			breadcrumbs: [
 				[ '/edit-product', __( 'Product', 'woocommerce' ) ],
@@ -197,8 +204,6 @@ export const getPages = () => {
 			navArgs: {
 				id: 'woocommerce-edit-product',
 			},
-			wpOpenMenu: 'menu-posts-product',
-			capability: 'manage_woocommerce',
 		} );
 	} else if (
 		window.wcAdminFeatures[ 'new-product-management-experience' ]
@@ -289,7 +294,7 @@ export const getPages = () => {
 			container: SettingsGroup,
 			path: '/settings/:page',
 			breadcrumbs: ( { match } ) => {
-				// @todo This might need to be refactored to retreive groups via data store.
+				// @todo This might need to be refactored to retrieve groups via data store.
 				const settingsPages = getAdminSetting( 'settingsPages' );
 				const page = settingsPages[ match.params.page ];
 				if ( ! page ) {
@@ -424,18 +429,22 @@ export const Controller = ( { ...props } ) => {
  */
 export function updateLinkHref( item, nextQuery, excludedScreens ) {
 	if ( isWCAdmin( item.href ) ) {
+		// If we accept a full HTMLAnchorElement, then we should be able to use `.search`.
+		// const query = new URLSearchParams( item.search );
+		// but to remain backward compatible, we support any object with `href` property.
 		const search = last( item.href.split( '?' ) );
-		const query = parse( search );
-		const path = query.path || 'homescreen';
+		let query = new URLSearchParams( search );
+		const path = query.get( 'path' ) || 'homescreen';
 		const screen = getScreenFromPath( path );
 
-		const isExcludedScreen = excludedScreens.includes( screen );
+		if ( ! excludedScreens.includes( screen ) ) {
+			query = new URLSearchParams( {
+				...Object.fromEntries( query ),
+				...nextQuery,
+			} );
+		}
 
-		const href =
-			'admin.php?' +
-			stringify(
-				Object.assign( query, isExcludedScreen ? {} : nextQuery )
-			);
+		const href = 'admin.php?' + query.toString();
 
 		// Replace the href so you can see the url on hover.
 		item.href = href;
@@ -451,9 +460,10 @@ export function updateLinkHref( item, nextQuery, excludedScreens ) {
 window.wpNavMenuUrlUpdate = function ( query ) {
 	const nextQuery = getPersistedQuery( query );
 	const excludedScreens = getQueryExcludedScreens();
+	const anchors = document.querySelectorAll( '#adminmenu a' );
 
-	Array.from( document.querySelectorAll( '#adminmenu a' ) ).forEach(
-		( item ) => updateLinkHref( item, nextQuery, excludedScreens )
+	Array.from( anchors ).forEach( ( item ) =>
+		updateLinkHref( item, nextQuery, excludedScreens )
 	);
 };
 
diff --git a/plugins/woocommerce-admin/client/layout/hooks/use-page-classes.ts b/plugins/woocommerce-admin/client/layout/hooks/use-page-classes.ts
new file mode 100644
index 00000000000..c1b3aadc0a9
--- /dev/null
+++ b/plugins/woocommerce-admin/client/layout/hooks/use-page-classes.ts
@@ -0,0 +1,56 @@
+/**
+ * External dependencies
+ */
+import { useEffect } from '@wordpress/element';
+import { RouteMatch } from 'react-router-dom';
+
+type Page = {
+	container: JSX.Element;
+	path: string;
+	breadcrumbs:
+		| string[]
+		| ( ( { match }: { match: RouteMatch } ) => string[] );
+	wpOpenMenu: string;
+	navArgs: {
+		id: string;
+	};
+	capability: string;
+};
+
+export function usePageClasses( page: Page ) {
+	function convertCamelCaseToKebabCase( str: string ) {
+		return str.replace(
+			/[A-Z]/g,
+			( letter ) => `-${ letter.toLowerCase() }`
+		);
+	}
+
+	function getPathClassName( path: string ) {
+		const suffix =
+			path === '/'
+				? '_home'
+				: path
+						.replace( /:[a-zA-Z?]+/g, function ( match ) {
+							return convertCamelCaseToKebabCase( match ).replace(
+								':',
+								''
+							);
+						} )
+						.replace( /\//g, '_' );
+
+		return `woocommerce-admin-page_${ suffix }`;
+	}
+
+	useEffect( () => {
+		if ( ! page.path ) {
+			return;
+		}
+
+		const classes = getPathClassName( page.path );
+
+		document.body.classList.add( classes );
+		return () => {
+			document.body.classList.remove( classes );
+		};
+	}, [ page.path ] );
+}
diff --git a/plugins/woocommerce-admin/client/layout/index.js b/plugins/woocommerce-admin/client/layout/index.js
index e6542bb24b3..13e1f8cc38b 100644
--- a/plugins/woocommerce-admin/client/layout/index.js
+++ b/plugins/woocommerce-admin/client/layout/index.js
@@ -4,7 +4,7 @@
 import { SlotFillProvider } from '@wordpress/components';
 import { compose } from '@wordpress/compose';
 import { withSelect } from '@wordpress/data';
-import { Component, lazy, Suspense } from '@wordpress/element';
+import { Component, lazy, Suspense, useEffect } from '@wordpress/element';
 import {
 	unstable_HistoryRouter as HistoryRouter,
 	Route,
@@ -15,8 +15,7 @@ import {
 } from 'react-router-dom';
 import { Children, cloneElement } from 'react';
 import PropTypes from 'prop-types';
-import { get, isFunction, identity, memoize } from 'lodash';
-import { parse } from 'qs';
+import { isFunction, identity } from 'lodash';
 import {
 	CustomerEffortScoreModalContainer,
 	triggerExitPageCesSurvey,
@@ -46,6 +45,7 @@ import { Footer } from './footer';
 import Notices from './notices';
 import TransientNotices from './transient-notices';
 import { getAdminSetting } from '~/utils/admin-settings';
+import { usePageClasses } from './hooks/use-page-classes';
 import '~/activity-panel';
 import '~/mobile-banner';
 import './navigation';
@@ -56,7 +56,7 @@ const StoreAlerts = lazy( () =>
 
 const WCPayUsageModal = lazy( () =>
 	import(
-		/* webpackChunkName: "wcpay-usage-modal" */ '../tasks/fills/PaymentGatewaySuggestions/components/WCPay/UsageModal'
+		/* webpackChunkName: "wcpay-usage-modal" */ '../task-lists/fills/PaymentGatewaySuggestions/components/WCPay/UsageModal'
 	)
 );
 
@@ -119,39 +119,18 @@ const LayoutSwitchWrapper = ( props ) => {
 	);
 };
 
-class _Layout extends Component {
-	memoizedLayoutContext = memoize(
-		( page ) => page?.navArgs?.id?.toLowerCase() || 'page'
-	);
-	componentDidMount() {
-		this.recordPageViewTrack();
-		triggerExitPageCesSurvey();
-	}
-
-	componentDidUpdate( prevProps ) {
-		const previousPath = get( prevProps, 'location.pathname' );
-		const currentPath = get( this.props, 'location.pathname' );
-
-		if ( ! previousPath || ! currentPath ) {
-			return;
-		}
-
-		if ( previousPath !== currentPath ) {
-			this.recordPageViewTrack();
-			setTimeout( () => {
-				triggerExitPageCesSurvey();
-			}, 0 );
-		}
-	}
-
-	recordPageViewTrack() {
-		const {
-			activePlugins,
-			installedPlugins,
-			isEmbedded,
-			isJetpackConnected,
-		} = this.props;
+function _Layout( {
+	activePlugins,
+	installedPlugins,
+	isEmbedded,
+	isJetpackConnected,
+	location,
+	match,
+	page,
+} ) {
+	usePageClasses( page );
 
+	function recordPageViewTrack() {
 		const navigationFlag = {
 			has_navigation: !! window.wcNavigation,
 		};
@@ -165,7 +144,7 @@ class _Layout extends Component {
 			return;
 		}
 
-		const pathname = get( this.props, 'location.pathname' );
+		const { pathname } = location;
 		if ( ! pathname ) {
 			return;
 		}
@@ -186,76 +165,81 @@ class _Layout extends Component {
 		} );
 	}
 
-	getQuery( searchString ) {
-		if ( ! searchString ) {
-			return {};
-		}
+	useEffect( () => {
+		triggerExitPageCesSurvey();
+	}, [] );
 
-		const search = searchString.substring( 1 );
-		return parse( search );
-	}
+	useEffect( () => {
+		recordPageViewTrack();
+		setTimeout( () => {
+			triggerExitPageCesSurvey();
+		}, 0 );
+	}, [ location?.pathname ] );
 
-	isWCPaySettingsPage() {
-		const { page, section, tab } = getQuery();
+	function isWCPaySettingsPage() {
+		const { page: queryPage, section, tab } = getQuery();
 		return (
-			page === 'wc-settings' &&
+			queryPage === 'wc-settings' &&
 			tab === 'checkout' &&
 			section === 'woocommerce_payments'
 		);
 	}
 
-	render() {
-		const { isEmbedded, ...restProps } = this.props;
-		const { location, page } = this.props;
-		const { breadcrumbs } = page;
-		const query = this.getQuery( location && location.search );
+	const { breadcrumbs, layout = { header: true, footer: true } } = page;
+	const { header: showHeader = true, footer: showFooter = true } = layout;
 
-		return (
-			<LayoutContextProvider
-				value={ getLayoutContextValue( [
-					this.memoizedLayoutContext( page ),
-				] ) }
-			>
-				<SlotFillProvider>
-					<div className="woocommerce-layout">
+	const query = Object.fromEntries(
+		new URLSearchParams( location && location.search )
+	);
+
+	return (
+		<LayoutContextProvider
+			value={ getLayoutContextValue( [
+				page?.navArgs?.id?.toLowerCase() || 'page',
+			] ) }
+		>
+			<SlotFillProvider>
+				<div className="woocommerce-layout">
+					{ showHeader && (
 						<Header
 							sections={
 								isFunction( breadcrumbs )
-									? breadcrumbs( this.props )
+									? breadcrumbs( { match } )
 									: breadcrumbs
 							}
 							isEmbedded={ isEmbedded }
 							query={ query }
 						/>
-						<TransientNotices />
-						{ ! isEmbedded && (
-							<PrimaryLayout>
-								<div className="woocommerce-layout__main">
-									<Controller
-										{ ...restProps }
-										query={ query }
-									/>
-								</div>
-							</PrimaryLayout>
-						) }
-
-						{ isEmbedded && this.isWCPaySettingsPage() && (
-							<Suspense fallback={ null }>
-								<WCPayUsageModal />
-							</Suspense>
-						) }
-						<Footer />
-						<CustomerEffortScoreModalContainer />
-					</div>
-					<PluginArea scope="woocommerce-admin" />
-					{ window.wcAdminFeatures.navigation && (
-						<PluginArea scope="woocommerce-navigation" />
 					) }
-					<PluginArea scope="woocommerce-tasks" />
-				</SlotFillProvider>
-			</LayoutContextProvider>
-		);
-	}
+					<TransientNotices />
+					{ ! isEmbedded && (
+						<PrimaryLayout>
+							<div className="woocommerce-layout__main">
+								<Controller
+									page={ page }
+									match={ match }
+									query={ query }
+								/>
+							</div>
+						</PrimaryLayout>
+					) }
+
+					{ isEmbedded && isWCPaySettingsPage() && (
+						<Suspense fallback={ null }>
+							<WCPayUsageModal />
+						</Suspense>
+					) }
+					{ showFooter && <Footer /> }
+					<CustomerEffortScoreModalContainer />
+				</div>
+				<PluginArea scope="woocommerce-admin" />
+				{ window.wcAdminFeatures.navigation && (
+					<PluginArea scope="woocommerce-navigation" />
+				) }
+				<PluginArea scope="woocommerce-tasks" />
+			</SlotFillProvider>
+		</LayoutContextProvider>
+	);
 }
 
 _Layout.propTypes = {
diff --git a/plugins/woocommerce-admin/client/layout/test/index.js b/plugins/woocommerce-admin/client/layout/test/index.js
index 1addf835050..a2d41f7824e 100644
--- a/plugins/woocommerce-admin/client/layout/test/index.js
+++ b/plugins/woocommerce-admin/client/layout/test/index.js
@@ -1,7 +1,14 @@
+/**
+ * External dependencies
+ */
+import { render } from '@testing-library/react';
+import { recordPageView } from '@woocommerce/tracks';
+
 /**
  * Internal dependencies
  */
 import { updateLinkHref } from '../controller';
+import { EmbedLayout } from '../index';
 
 describe( 'updateLinkHref', () => {
 	const timeExcludedScreens = [ 'stock', 'settings', 'customers' ];
@@ -63,3 +70,14 @@ describe( 'updateLinkHref', () => {
 		expect( item.href ).toBe( WP_ADMIN_URL );
 	} );
 } );
+
+describe( 'Layout', () => {
+	it( 'should call recordPageView with correct parameters', () => {
+		window.history.pushState( {}, 'Page Title', '/url?search' );
+		render( <EmbedLayout /> );
+		expect( recordPageView ).toHaveBeenCalledWith( '/url?search', {
+			has_navigation: true,
+			is_embedded: true,
+		} );
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/navigation/components/Item/index.js b/plugins/woocommerce-admin/client/navigation/components/Item/index.js
index 07771664514..c08888e8b72 100644
--- a/plugins/woocommerce-admin/client/navigation/components/Item/index.js
+++ b/plugins/woocommerce-admin/client/navigation/components/Item/index.js
@@ -19,7 +19,7 @@ const Item = ( { item } ) => {
 	// and should not be a tabbable element.
 	/* eslint-disable jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
 
-	// Only render a slot if a coresponding Fill exists and the item is not a category
+	// Only render a slot if a corresponding Fill exists and the item is not a category
 	if ( hasFills && ! item.isCategory ) {
 		return (
 			<NavigationItem key={ item.id } item={ item.id }>
diff --git a/plugins/woocommerce-admin/client/navigation/utils.ts b/plugins/woocommerce-admin/client/navigation/utils.ts
index 446f0b4f2bb..04c1bc4b1ac 100644
--- a/plugins/woocommerce-admin/client/navigation/utils.ts
+++ b/plugins/woocommerce-admin/client/navigation/utils.ts
@@ -190,7 +190,7 @@ export const sortMenuItems = ( menuItems: Item[] ): Item[] => {
 };
 
 /**
- * Get a flat tree structure of all Categories and thier children grouped by menuId
+ * Get a flat tree structure of all Categories and their children grouped by menuId
  *
  * @param {Array}    menuItems      Array of menu items.
  * @param {Function} currentUserCan Callback method passed the capability to determine if a menu item is visible.
diff --git a/plugins/woocommerce-admin/client/payments/test/payment-recommendations.test.tsx b/plugins/woocommerce-admin/client/payments/test/payment-recommendations.test.tsx
index aa911412981..58e6acb1767 100644
--- a/plugins/woocommerce-admin/client/payments/test/payment-recommendations.test.tsx
+++ b/plugins/woocommerce-admin/client/payments/test/payment-recommendations.test.tsx
@@ -9,7 +9,7 @@ import { recordEvent } from '@woocommerce/tracks';
  * Internal dependencies
  */
 import PaymentRecommendations from '../payment-recommendations';
-import { isWCPaySupported } from '../../tasks/fills/PaymentGatewaySuggestions/components/WCPay';
+import { isWCPaySupported } from '../../task-lists/fills/PaymentGatewaySuggestions/components/WCPay';
 import { createNoticesFromResponse } from '~/lib/notices';
 
 jest.mock( '@woocommerce/tracks', () => ( { recordEvent: jest.fn() } ) );
@@ -44,7 +44,7 @@ jest.mock( '@woocommerce/components', () => ( {
 	),
 } ) );
 jest.mock(
-	'../../tasks/fills/PaymentGatewaySuggestions/components/WCPay',
+	'../../task-lists/fills/PaymentGatewaySuggestions/components/WCPay',
 	() => ( {
 		isWCPaySupported: jest.fn(),
 	} )
diff --git a/plugins/woocommerce-admin/client/products/add-edit-product-page.scss b/plugins/woocommerce-admin/client/products/add-edit-product-page.scss
new file mode 100644
index 00000000000..864dfdb0ecb
--- /dev/null
+++ b/plugins/woocommerce-admin/client/products/add-edit-product-page.scss
@@ -0,0 +1,136 @@
+.woocommerce-add-product,
+.woocommerce-edit-product {
+	.woocommerce-product-form-actions {
+		margin-top: $gap-largest + $gap-smaller;
+	}
+	.components-checkbox-control,
+	.components-toggle-control {
+		& > * {
+			margin-bottom: 0;
+		}
+	}
+	.components-input-control {
+		&__prefix {
+			margin-left: $gap-smaller;
+		}
+		&__suffix {
+			margin-right: $gap-smaller;
+		}
+	}
+	.components-currency-control {
+		.components-input-control__prefix {
+			color: $gray-700;
+		}
+		.components-input-control__input {
+			text-align: right;
+		}
+	}
+	.components-checkbox-control {
+		&__label {
+			display: flex;
+			align-items: center;
+		}
+
+		&__input-container {
+			align-self: center;
+		}
+
+		.components-base-control__field {
+			display: flex;
+		}
+	}
+	.components-toggle-control
+	.components-base-control__field
+	.components-toggle-control__label {
+		display: flex;
+		align-items: center;
+	}
+	.woocommerce-tooltip {
+		margin-left: $gap-smaller;
+		&__button {
+			padding: 0;
+		}
+	}
+	.woocommerce-product-form {
+		&__custom-label-input {
+			display: flex;
+			flex-direction: column;
+			label {
+				display: block;
+				margin-bottom: $gap-smaller;
+			}
+		}
+		&__optional-input {
+			color: $gray-700;
+		}
+		&__secondary-text {
+			font-size: 12px;
+			color: $gray-700;
+			margin-top: $gap-smaller;
+		}
+	}
+	.has-error {
+		.components-base-control__help {
+			color: $studio-red-50;
+			margin-bottom: 0;
+		}
+	}
+
+	// This is needed because Gutenberg disables tooltip events on disabled elements.
+	// We are explicitly using this on a disabled item so this overlay prevents
+	// the tooltip from seeing the disabled property and allows mouse events to occur.
+	// See https://github.com/WordPress/gutenberg/blob/411b6eee8376e31bf9db4c15c92a80524ae38e9b/packages/components/src/tooltip/index.js#L99-L102
+	.woocommerce-product-form__tooltip-disabled-overlay {
+		position: relative;
+		display: inline-block;
+		&::after {
+			content: '';
+			display: inline-block;
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			background: transparent;
+			left: 0;
+			top: 0;
+			cursor: default;
+		}
+
+		.components-base-control {
+			margin-bottom: 0;
+		}
+	}
+	.half-width-field {
+		@include breakpoint( '<960px' ) {
+			width: 100%;
+		}
+		width: 50%;
+	}
+
+	.components-base-control__label {
+		.woocommerce-product-form__secondary-text {
+			display: block;
+			font-weight: 400;
+		}
+	}
+}
+
+.woocommerce-edit-product {
+	position: relative;
+
+	&__error {
+		background: #fff;
+		text-align: center;
+		border: 1px solid $gray-400;
+		border-radius: 2px;
+		padding: 1em 2em;
+	}
+
+	&__spinner {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		width: 100%;
+		height: 100%;
+	}
+}
diff --git a/plugins/woocommerce-admin/client/products/add-product-page.tsx b/plugins/woocommerce-admin/client/products/add-product-page.tsx
index 34c0126b64f..4df69e4cc61 100644
--- a/plugins/woocommerce-admin/client/products/add-product-page.tsx
+++ b/plugins/woocommerce-admin/client/products/add-product-page.tsx
@@ -15,7 +15,7 @@ import {
  */
 import { ProductForm } from './product-form';
 import { ProductTourContainer } from './tour';
-import './product-page.scss';
+import './add-edit-product-page.scss';
 import './fills';
 
 const AddProductPage: React.FC = () => {
diff --git a/plugins/woocommerce-admin/client/products/edit-product-page.tsx b/plugins/woocommerce-admin/client/products/edit-product-page.tsx
index 88ee6656876..0c2d1273f11 100644
--- a/plugins/woocommerce-admin/client/products/edit-product-page.tsx
+++ b/plugins/woocommerce-admin/client/products/edit-product-page.tsx
@@ -21,7 +21,7 @@ import { useParams } from 'react-router-dom';
 import { ProductForm } from './product-form';
 import { ProductFormLayout } from './layout/product-form-layout';
 import { ProductVariationForm } from './product-variation-form';
-import './product-page.scss';
+import './add-edit-product-page.scss';
 import './fills';
 
 const EditProductPage: React.FC = () => {
@@ -94,7 +94,7 @@ const EditProductPage: React.FC = () => {
 	);
 
 	useEffect( () => {
-		// used for determening the wasDeletedUsingAction condition.
+		// used for determining the wasDeletedUsingAction condition.
 		if (
 			previousProductRef.current &&
 			product &&
diff --git a/plugins/woocommerce-admin/client/products/product-page.scss b/plugins/woocommerce-admin/client/products/product-page.scss
index 864dfdb0ecb..9c80168e264 100644
--- a/plugins/woocommerce-admin/client/products/product-page.scss
+++ b/plugins/woocommerce-admin/client/products/product-page.scss
@@ -1,136 +1,44 @@
-.woocommerce-add-product,
-.woocommerce-edit-product {
-	.woocommerce-product-form-actions {
-		margin-top: $gap-largest + $gap-smaller;
-	}
-	.components-checkbox-control,
-	.components-toggle-control {
-		& > * {
-			margin-bottom: 0;
-		}
-	}
-	.components-input-control {
-		&__prefix {
-			margin-left: $gap-smaller;
-		}
-		&__suffix {
-			margin-right: $gap-smaller;
-		}
-	}
-	.components-currency-control {
-		.components-input-control__prefix {
-			color: $gray-700;
-		}
-		.components-input-control__input {
-			text-align: right;
-		}
-	}
-	.components-checkbox-control {
-		&__label {
-			display: flex;
-			align-items: center;
-		}
-
-		&__input-container {
-			align-self: center;
-		}
-
-		.components-base-control__field {
-			display: flex;
-		}
-	}
-	.components-toggle-control
-	.components-base-control__field
-	.components-toggle-control__label {
-		display: flex;
-		align-items: center;
-	}
-	.woocommerce-tooltip {
-		margin-left: $gap-smaller;
-		&__button {
-			padding: 0;
-		}
-	}
-	.woocommerce-product-form {
-		&__custom-label-input {
-			display: flex;
-			flex-direction: column;
-			label {
-				display: block;
-				margin-bottom: $gap-smaller;
-			}
-		}
-		&__optional-input {
-			color: $gray-700;
-		}
-		&__secondary-text {
-			font-size: 12px;
-			color: $gray-700;
-			margin-top: $gap-smaller;
-		}
-	}
-	.has-error {
-		.components-base-control__help {
-			color: $studio-red-50;
-			margin-bottom: 0;
-		}
+.woocommerce-admin-page__add-product,
+.woocommerce-admin-page__product_product-id {
+	.woocommerce-store-alerts {
+		display: none;
 	}
 
-	// This is needed because Gutenberg disables tooltip events on disabled elements.
-	// We are explicitly using this on a disabled item so this overlay prevents
-	// the tooltip from seeing the disabled property and allows mouse events to occur.
-	// See https://github.com/WordPress/gutenberg/blob/411b6eee8376e31bf9db4c15c92a80524ae38e9b/packages/components/src/tooltip/index.js#L99-L102
-	.woocommerce-product-form__tooltip-disabled-overlay {
-		position: relative;
-		display: inline-block;
-		&::after {
-			content: '';
-			display: inline-block;
-			position: absolute;
-			width: 100%;
-			height: 100%;
-			background: transparent;
-			left: 0;
-			top: 0;
-			cursor: default;
-		}
-
-		.components-base-control {
-			margin-bottom: 0;
-		}
+	.woocommerce-layout__primary {
+		margin-left: 0;
+		margin-right: 0;
+		margin-bottom: 0;
 	}
-	.half-width-field {
+
+	.woocommerce-layout .woocommerce-layout__main {
+		padding: 0;
+	}
+
+	.interface-interface-skeleton {
+		background-color: $white;
+		position: static;
+	}
+
+	.interface-interface-skeleton__sidebar {
+		width: 280px;
+	}
+
+	.interface-interface-skeleton__header {
+		background-color: $white;
+		width: calc(100% - $admin-menu-width);
+		left: $admin-menu-width;
+		top: $adminbar-height;
+		position: fixed;
 		@include breakpoint( '<960px' ) {
+			left: $admin-menu-width-collapsed;
+			width: calc(100% - $admin-menu-width-collapsed);
+		}
+		@include breakpoint( '<782px' ) {
+			top: $adminbar-height-mobile;
+			left: 0;
 			width: 100%;
 		}
-		width: 50%;
-	}
-
-	.components-base-control__label {
-		.woocommerce-product-form__secondary-text {
-			display: block;
-			font-weight: 400;
-		}
-	}
-}
-
-.woocommerce-edit-product {
-	position: relative;
-
-	&__error {
-		background: #fff;
-		text-align: center;
-		border: 1px solid $gray-400;
-		border-radius: 2px;
-		padding: 1em 2em;
-	}
-
-	&__spinner {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		width: 100%;
-		height: 100%;
+		// Higher than the sidebar which has a z-index of 90.
+		z-index: 100;
 	}
 }
diff --git a/plugins/woocommerce-admin/client/products/product-page.tsx b/plugins/woocommerce-admin/client/products/product-page.tsx
index 042a116d03f..f97b04d05c3 100644
--- a/plugins/woocommerce-admin/client/products/product-page.tsx
+++ b/plugins/woocommerce-admin/client/products/product-page.tsx
@@ -3,19 +3,20 @@
  */
 import {
 	__experimentalEditor as Editor,
+	__experimentalInitBlocks as initBlocks,
 	ProductEditorSettings,
 	productApiFetchMiddleware,
 } from '@woocommerce/product-editor';
-
 import { Spinner } from '@wordpress/components';
+import { useEffect } from '@wordpress/element';
 import { useParams } from 'react-router-dom';
 
 /**
  * Internal dependencies
  */
 import { useProductEntityRecord } from './hooks/use-product-entity-record';
-
 import './fills/product-block-editor-fills';
+import './product-page.scss';
 
 declare const productBlockEditorSettings: ProductEditorSettings;
 
@@ -26,6 +27,10 @@ export default function ProductPage() {
 
 	const product = useProductEntityRecord( productId );
 
+	useEffect( () => {
+		return initBlocks();
+	}, [] );
+
 	if ( ! product?.id ) {
 		return <Spinner />;
 	}
diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js
index fd253935a29..0b801ddc240 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js
@@ -14,6 +14,7 @@ import {
 	FlexItem,
 	CheckboxControl,
 	Spinner,
+	Notice,
 } from '@wordpress/components';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { Form, TextControl, SelectControl } from '@woocommerce/components';
@@ -114,6 +115,11 @@ export const prepareExtensionTrackingInstallationData = (
 	return data;
 };
 
+export const isShowWccomMigrationNotice = ( selectedOption ) =>
+	[ 'other-woocommerce', 'other', 'brick-mortar-other' ].includes(
+		selectedOption
+	);
+
 export const isSellingElsewhere = ( selectedOption ) =>
 	[
 		'other',
@@ -122,6 +128,10 @@ export const isSellingElsewhere = ( selectedOption ) =>
 		'other-woocommerce',
 	].includes( selectedOption );
 
+const getWccomMigrationUrl = ( selectedOption ) => {
+	return `https://woocommerce.com/migrate/?utm_source=nux&utm_medium=product&utm_campaign=migrate&utm_content=${ selectedOption }`;
+};
+
 export const isSellingOtherPlatformInPerson = ( selectedOption ) =>
 	[ 'other', 'brick-mortar-other' ].includes( selectedOption );
 
@@ -524,7 +534,34 @@ class BusinessDetails extends Component {
 											'selling_venues'
 										) }
 									/>
-
+									{ isShowWccomMigrationNotice(
+										values.selling_venues
+									) && (
+										<Notice
+											className="woocommerce-profile-wizard__wccom-migration-notice"
+											status="info"
+											isDismissible={ false }
+										>
+											{ __(
+												'Need help moving your store?',
+												'woocommerce'
+											) }
+											&nbsp;
+											<Button
+												href={ getWccomMigrationUrl(
+													values.selling_venues
+												) }
+												target="_blank"
+												rel="noopener noreferrer"
+												variant="link"
+											>
+												{ __(
+													'Get free expert advice',
+													'woocommerce'
+												) }
+											</Button>
+										</Notice>
+									) }
 									{ isSellingElsewhere(
 										values.selling_venues
 									) && (
diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss
index c4d3868a59f..961aa2ff5cf 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss
@@ -20,3 +20,13 @@
 		}
 	}
 }
+
+.woocommerce-profile-wizard__wccom-migration-notice {
+	margin: 0;
+	background: #f0f9fc;
+	height: 48px;
+	font-size: 14px;
+	a {
+		font-size: 14px;
+	}
+}
diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/store-details/index.js b/plugins/woocommerce-admin/client/profile-wizard/steps/store-details/index.js
index cfd148cab43..c2e0017ed5e 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/store-details/index.js
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/store-details/index.js
@@ -181,7 +181,7 @@ export class StoreDetails extends Component {
 		 * `await` and performs an update aysnchronously. This means the following
 		 * screen may not be initialized with correct profile settings.
 		 *
-		 * This comment may be removed when a refactor to wp.data datatores is complete.
+		 * This comment may be removed when a refactor to wp.data datastores is complete.
 		 */
 		if (
 			region !== 'US' &&
diff --git a/plugins/woocommerce-admin/client/store-management-links/style.scss b/plugins/woocommerce-admin/client/store-management-links/style.scss
index b6e5931074b..e25ba23617d 100644
--- a/plugins/woocommerce-admin/client/store-management-links/style.scss
+++ b/plugins/woocommerce-admin/client/store-management-links/style.scss
@@ -1,5 +1,3 @@
-// Setting a custom size that is not recognised by the <CardBody> allows us to override the card's default padding sizes.
-// We need to do this to allow item hover backgrounds to stretch the whole card body.
-.woocommerce-store-management-links__card-body.is-size-custom {
-	padding: 24px 0 8px 0;
+.woocommerce-store-management-links__card-body {
+	padding-top: $gap;
 }
diff --git a/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss b/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss
index 6ef60842cd2..57435876631 100644
--- a/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss
+++ b/plugins/woocommerce-admin/client/stylesheets/shared/_reset.scss
@@ -71,7 +71,7 @@
 	}
 }
 
-// Temporary fix for compability with the Jetpack masterbar
+// Temporary fix for compatibility with the Jetpack masterbar
 // See https://github.com/Automattic/jetpack/issues/9608
 @include breakpoint( '<782px' ) {
 	.jetpack-masterbar {
diff --git a/plugins/woocommerce-admin/client/tasks/back-button.scss b/plugins/woocommerce-admin/client/task-lists/components/back-button.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/back-button.scss
rename to plugins/woocommerce-admin/client/task-lists/components/back-button.scss
diff --git a/plugins/woocommerce-admin/client/tasks/back-button.tsx b/plugins/woocommerce-admin/client/task-lists/components/back-button.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/back-button.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/back-button.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/placeholder.scss b/plugins/woocommerce-admin/client/task-lists/components/placeholder.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/placeholder.scss
rename to plugins/woocommerce-admin/client/task-lists/components/placeholder.scss
diff --git a/plugins/woocommerce-admin/client/tasks/placeholder.tsx b/plugins/woocommerce-admin/client/task-lists/components/placeholder.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/placeholder.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/placeholder.tsx
diff --git a/plugins/woocommerce-admin/client/task-lists/progress-header/default-progress-header.tsx b/plugins/woocommerce-admin/client/task-lists/components/progress-header/default-progress-header.tsx
similarity index 96%
rename from plugins/woocommerce-admin/client/task-lists/progress-header/default-progress-header.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/progress-header/default-progress-header.tsx
index 1980bdc4d55..ef63ab57b0f 100644
--- a/plugins/woocommerce-admin/client/task-lists/progress-header/default-progress-header.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/components/progress-header/default-progress-header.tsx
@@ -9,7 +9,7 @@ import { getVisibleTasks, ONBOARDING_STORE_NAME } from '@woocommerce/data';
  * Internal dependencies
  */
 import './progress-header.scss';
-import { TaskListMenu } from '~/tasks/task-list-menu';
+import { TaskListMenu } from '~/task-lists/components/task-list-menu';
 
 export type DefaultProgressHeaderProps = {
 	taskListId: string;
diff --git a/plugins/woocommerce-admin/client/task-lists/progress-header/index.ts b/plugins/woocommerce-admin/client/task-lists/components/progress-header/index.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/task-lists/progress-header/index.ts
rename to plugins/woocommerce-admin/client/task-lists/components/progress-header/index.ts
diff --git a/plugins/woocommerce-admin/client/task-lists/progress-header/progress-header.scss b/plugins/woocommerce-admin/client/task-lists/components/progress-header/progress-header.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/task-lists/progress-header/progress-header.scss
rename to plugins/woocommerce-admin/client/task-lists/components/progress-header/progress-header.scss
diff --git a/plugins/woocommerce-admin/client/task-lists/progress-header/progress-header.tsx b/plugins/woocommerce-admin/client/task-lists/components/progress-header/progress-header.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/task-lists/progress-header/progress-header.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/progress-header/progress-header.tsx
diff --git a/plugins/woocommerce-admin/client/task-lists/progress-header/utils.tsx b/plugins/woocommerce-admin/client/task-lists/components/progress-header/utils.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/task-lists/progress-header/utils.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/progress-header/utils.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/task-list-item.tsx b/plugins/woocommerce-admin/client/task-lists/components/task-list-item.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/task-list-item.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/task-list-item.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/task-list-menu.tsx b/plugins/woocommerce-admin/client/task-lists/components/task-list-menu.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/task-list-menu.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/task-list-menu.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/task-list.scss b/plugins/woocommerce-admin/client/task-lists/components/task-list.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/task-list.scss
rename to plugins/woocommerce-admin/client/task-lists/components/task-list.scss
diff --git a/plugins/woocommerce-admin/client/tasks/task-list.tsx b/plugins/woocommerce-admin/client/task-lists/components/task-list.tsx
similarity index 97%
rename from plugins/woocommerce-admin/client/tasks/task-list.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/task-list.tsx
index 6fd4ebf8dbf..35e0ee52e14 100644
--- a/plugins/woocommerce-admin/client/tasks/task-list.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/components/task-list.tsx
@@ -21,14 +21,13 @@ import { useLayoutContext } from '@woocommerce/admin-layout';
 import { TaskListItem } from './task-list-item';
 import { TaskListMenu } from './task-list-menu';
 import './task-list.scss';
-import { ProgressHeader } from '~/task-lists/progress-header';
+import { ProgressHeader } from '~/task-lists/components/progress-header';
 
 export type TaskListProps = TaskListType & {
 	query: {
 		task?: string;
 	};
 	eventName?: string;
-	twoColumns?: boolean;
 	keepCompletedTaskList?: 'yes' | 'no';
 	cesHeader?: boolean;
 };
diff --git a/plugins/woocommerce-admin/client/tasks/task.tsx b/plugins/woocommerce-admin/client/task-lists/components/task.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/task.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/task.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/test/task-list-item.test.tsx b/plugins/woocommerce-admin/client/task-lists/components/test/task-list-item.test.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/test/task-list-item.test.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/test/task-list-item.test.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/test/task-list.test.tsx b/plugins/woocommerce-admin/client/task-lists/components/test/task-list.test.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/test/task-list.test.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/test/task-list.test.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/test/task.test.tsx b/plugins/woocommerce-admin/client/task-lists/components/test/task.test.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/test/task.test.tsx
rename to plugins/woocommerce-admin/client/task-lists/components/test/task.test.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/Marketing/Marketing.scss b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/Marketing.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/Marketing/Marketing.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/Marketing/Marketing.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/Marketing/Plugin.scss b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/Plugin.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/Marketing/Plugin.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/Marketing/Plugin.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/Marketing/Plugin.tsx b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/Plugin.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/Marketing/Plugin.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/Marketing/Plugin.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/Marketing/PluginList.scss b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/PluginList.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/Marketing/PluginList.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/Marketing/PluginList.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/Marketing/PluginList.tsx b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/PluginList.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/Marketing/PluginList.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/Marketing/PluginList.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/Marketing/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/Marketing/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/Marketing/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/Marketing/test/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/test/index.tsx
similarity index 99%
rename from plugins/woocommerce-admin/client/tasks/fills/Marketing/test/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/Marketing/test/index.tsx
index 6caa7b753d4..fab753179f4 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/Marketing/test/index.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/fills/Marketing/test/index.tsx
@@ -6,7 +6,7 @@ import { Extension } from '@woocommerce/data';
 /**
  * Internal dependencies
  */
-import { transformExtensionToPlugin, getMarketingExtensionLists } from '../';
+import { transformExtensionToPlugin, getMarketingExtensionLists } from '..';
 
 const basicPlugins: Extension[] = [
 	{
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Action.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Action.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Action.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Action.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/Item.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/Item.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/Item.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/Item.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/List.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/List.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/List.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/List.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/List.scss b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/List.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/List.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/List.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/Placeholder.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/Placeholder.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/Placeholder.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/Placeholder.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/fallback.png b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/fallback.png
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/fallback.png
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/fallback.png
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/index.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/index.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/index.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/test/list.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/test/list.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/List/test/list.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/List/test/list.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Configure.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Configure.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Configure.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Configure.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Placeholder.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Placeholder.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Placeholder.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Placeholder.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Setup.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Setup.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Setup.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Setup.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Setup.scss b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Setup.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/Setup.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/Setup.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/index.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/index.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/index.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/test/configure.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/test/configure.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/test/configure.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/test/configure.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/test/setup.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/test/setup.js
similarity index 98%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/test/setup.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/test/setup.js
index f5643ec761e..15564b970b3 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Setup/test/setup.js
+++ b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Setup/test/setup.js
@@ -6,7 +6,7 @@ import { render } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import { Setup } from '../';
+import { Setup } from '..';
 import { enqueueScript } from '~/utils/enqueue-script';
 
 jest.mock( '@woocommerce/components', () => {
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.scss b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Toggle/Toggle.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Toggle/index.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Toggle/index.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/Toggle/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/Toggle/index.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/Suggestion.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/Suggestion.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/Suggestion.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/Suggestion.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/UsageModal.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/UsageModal.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/UsageModal.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/UsageModal.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/index.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/index.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/index.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/suggestion.scss b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/suggestion.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/suggestion.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/suggestion.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/utils.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/utils.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/components/WCPay/utils.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/components/WCPay/utils.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/index.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/index.js
similarity index 92%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/index.js
index a1e9e4fb118..549945566c0 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/index.js
+++ b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/index.js
@@ -202,26 +202,24 @@ export const PaymentGatewaySuggestions = ( { onComplete, query } ) => {
 		'To start accepting online payments',
 		'woocommerce'
 	);
-	if ( isWCPaySupported ) {
-		if ( isWCPayOrOtherCategoryDoneSetup ) {
-			additionalSectionHeading = __(
-				'Additional payment options',
-				'woocommerce'
-			);
-			additionalSectionHeadingDescription = __(
-				'Give your customers additional choices in ways to pay.',
-				'woocommerce'
-			);
-		} else {
-			additionalSectionHeading = __(
-				'Other payment providers',
-				'woocommerce'
-			);
-			additionalSectionHeadingDescription = __(
-				'Try one of the alternative payment providers.',
-				'woocommerce'
-			);
-		}
+	if ( isWCPayOrOtherCategoryDoneSetup ) {
+		additionalSectionHeading = __(
+			'Additional payment options',
+			'woocommerce'
+		);
+		additionalSectionHeadingDescription = __(
+			'Give your customers additional choices in ways to pay.',
+			'woocommerce'
+		);
+	} else if ( isWCPaySupported ) {
+		additionalSectionHeading = __(
+			'Other payment providers',
+			'woocommerce'
+		);
+		additionalSectionHeadingDescription = __(
+			'Try one of the alternative payment providers.',
+			'woocommerce'
+		);
 	}
 
 	const additionalSection = !! additionalGateways.length && (
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/payment-gateway-suggestions.scss b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/payment-gateway-suggestions.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/payment-gateway-suggestions.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/payment-gateway-suggestions.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/plugins/Bacs.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/plugins/Bacs.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/plugins/Bacs.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/plugins/Bacs.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/test/index.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/test/index.js
similarity index 87%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/test/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/test/index.js
index 08de19aa480..74b3278effa 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/test/index.js
+++ b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/test/index.js
@@ -223,7 +223,7 @@ describe( 'PaymentGatewaySuggestions', () => {
 		expect( getByText( 'Finish setup' ) ).toBeInTheDocument();
 	} );
 
-	test( 'should show "category_additional" gateways only after WCPay is set up', () => {
+	test( 'should show "category_additional" gateways after WCPay is set up', () => {
 		const onComplete = jest.fn();
 		const query = {};
 		useSelect.mockImplementation( () => ( {
@@ -269,6 +269,54 @@ describe( 'PaymentGatewaySuggestions', () => {
 		] );
 	} );
 
+	test( 'should show "category_additional" gateways after a primary gateway (other than WCPay) is set up', () => {
+		const onComplete = jest.fn();
+		const query = {};
+		useSelect.mockImplementation( () => ( {
+			isResolving: false,
+			getPaymentGateway: jest.fn(),
+			paymentGatewaySuggestions,
+			installedPaymentGateways: [
+				{
+					id: 'ppcp-gateway',
+					title: 'PayPal Payments',
+					content:
+						"Safe and secure payments using credit cards or your customer's PayPal account.",
+					image: 'http://localhost:8888/wp-content/plugins/woocommerce/assets/images/paypal.png',
+					plugins: [ 'woocommerce-paypal-payments' ],
+					is_visible: true,
+				},
+			],
+			countryCode: 'US',
+		} ) );
+
+		const { container } = render(
+			<PaymentGatewaySuggestions
+				onComplete={ onComplete }
+				query={ query }
+			/>
+		);
+
+		expect(
+			screen.getByText( 'Additional payment options' )
+		).toBeInTheDocument();
+
+		const paymentTitleElements = container.querySelectorAll(
+			'.woocommerce-task-payment__title'
+		);
+
+		const paymentTitles = Array.from( paymentTitleElements ).map(
+			( e ) => e.textContent
+		);
+
+		expect( paymentTitles ).toEqual( [
+			'PayPal PaymentsSetup required',
+			'Eway',
+			'Cash on delivery',
+			'Direct bank transfer',
+		] );
+	} );
+
 	test( 'should record event correctly when finish setup is clicked', () => {
 		const onComplete = jest.fn();
 		const query = {};
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/test/utils.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/test/utils.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/test/utils.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/test/utils.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/utils.js b/plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/utils.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/utils.js
rename to plugins/woocommerce-admin/client/task-lists/fills/PaymentGatewaySuggestions/utils.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/appearance.js b/plugins/woocommerce-admin/client/task-lists/fills/appearance.js
similarity index 98%
rename from plugins/woocommerce-admin/client/tasks/fills/appearance.js
rename to plugins/woocommerce-admin/client/task-lists/fills/appearance.js
index cf89d248ba4..5bb7ce41f60 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/appearance.js
+++ b/plugins/woocommerce-admin/client/task-lists/fills/appearance.js
@@ -25,11 +25,13 @@ import { WooOnboardingTask } from '@woocommerce/onboarding';
 class Appearance extends Component {
 	constructor( props ) {
 		super( props );
-		const { hasHomepage, hasProducts } = props.task.additionalData;
+		const { hasHomepage, hasProducts, supportCustomLogo } =
+			props.task.additionalData;
 
 		this.stepVisibility = {
 			homepage: ! hasHomepage,
 			import: ! hasProducts,
+			logo: supportCustomLogo,
 		};
 
 		this.state = {
@@ -210,7 +212,7 @@ class Appearance extends Component {
 			this.setState( { isUpdatingLogo: false } );
 			createNotice(
 				'success',
-				__( 'Store logo updated sucessfully', 'woocommerce' )
+				__( 'Store logo updated successfully', 'woocommerce' )
 			);
 			this.completeStep();
 		} else {
@@ -338,7 +340,7 @@ class Appearance extends Component {
 						</Button>
 					</Fragment>
 				),
-				visible: true,
+				visible: this.stepVisibility.logo,
 			},
 			{
 				key: 'notice',
diff --git a/plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-confirm-modal.scss b/plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-confirm-modal.scss
similarity index 63%
rename from plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-confirm-modal.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-confirm-modal.scss
index e5eb6043b1c..1f72e411da4 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-confirm-modal.scss
+++ b/plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-confirm-modal.scss
@@ -1,3 +1,17 @@
+.woocommerce-products-load-sample-product-confirm-modal-overlay {
+	@media (min-width: 783px ) {
+		& {
+			left: 35px;
+		}
+	}
+
+	@include break-large {
+		& {
+			left: 160px;
+		}
+	}
+}
+
 .woocommerce-products-load-sample-product-confirm-modal {
 	.components-truncate.components-text.woocommerce-confirmation-modal__message {
 		color: $studio-gray-60;
diff --git a/plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-confirm-modal.tsx b/plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-confirm-modal.tsx
similarity index 93%
rename from plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-confirm-modal.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-confirm-modal.tsx
index 4d0cc29299d..3606be4142c 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-confirm-modal.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-confirm-modal.tsx
@@ -22,6 +22,7 @@ export const LoadSampleProductConfirmModal: React.VFC< Props > = ( {
 	return (
 		<Modal
 			className="woocommerce-products-load-sample-product-confirm-modal"
+			overlayClassName="woocommerce-products-load-sample-product-confirm-modal-overlay"
 			title={ __( 'Load sample products', 'woocommerce' ) }
 			onRequestClose={ onCancel }
 		>
diff --git a/plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-modal.scss b/plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-modal.scss
similarity index 92%
rename from plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-modal.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-modal.scss
index ee3776206b7..0bd8f516962 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-modal.scss
+++ b/plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-modal.scss
@@ -25,7 +25,8 @@
 		display: none;
 	}
 
-	.components-modal__content {
+	.components-modal__content,
+	.components-modal__header + div {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
diff --git a/plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-modal.tsx b/plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-modal.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/components/load-sample-product-modal.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/components/load-sample-product-modal.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/components/test/load-sample-product-modal.tsx b/plugins/woocommerce-admin/client/task-lists/fills/components/test/load-sample-product-modal.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/components/test/load-sample-product-modal.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/components/test/load-sample-product-modal.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/components/use-load-sample-products.ts b/plugins/woocommerce-admin/client/task-lists/fills/components/use-load-sample-products.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/components/use-load-sample-products.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/components/use-load-sample-products.ts
diff --git a/plugins/woocommerce-admin/client/tasks/deprecated-tasks.tsx b/plugins/woocommerce-admin/client/task-lists/fills/deprecated-tasks.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/deprecated-tasks.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/deprecated-tasks.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/connect.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/connect.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/connect.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/connect.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/plugin-banner.scss b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/plugin-banner.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/plugin-banner.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/plugin-banner.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/plugin-banner.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/plugin-banner.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/plugin-banner.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/plugin-banner.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/plugins.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/plugins.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/plugins.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/plugins.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/store-location.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/store-location.tsx
similarity index 95%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/store-location.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/store-location.tsx
index 9479c0d7635..00b8670e3c1 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/store-location.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/store-location.tsx
@@ -11,7 +11,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
  */
 import { getCountryCode } from '~/dashboard/utils';
 import { hasCompleteAddress } from '../../tax/utils';
-import { default as StoreLocationForm } from '~/tasks/fills/steps/location';
+import { default as StoreLocationForm } from '~/task-lists/fills/steps/location';
 
 export const StoreLocation: React.FC< {
 	nextStep: () => void;
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/wcs-banner.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/wcs-banner.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/components/wcs-banner.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/components/wcs-banner.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/discount.svg b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/discount.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/discount.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/discount.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/paper.svg b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/paper.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/paper.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/paper.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/printer.svg b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/printer.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/printer.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/printer.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/shipstation.svg b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/shipstation.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/shipstation.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/shipstation.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/star.svg b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/star.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/star.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/star.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/timer.svg b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/timer.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/timer.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/timer.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/wcs.svg b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/wcs.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/images/wcs.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/images/wcs.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/shipping-recommendation.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/shipping-recommendation.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/shipping-recommendation.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/shipping-recommendation.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/test/shipping-recommendation.tsx b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/test/shipping-recommendation.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/test/shipping-recommendation.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/test/shipping-recommendation.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/types.ts b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/types.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/types.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/types.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/utils.ts b/plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/utils.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/experimental-shipping-recommendation/utils.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/experimental-shipping-recommendation/utils.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/import-products/CardList.tsx b/plugins/woocommerce-admin/client/task-lists/fills/import-products/CardList.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/import-products/CardList.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/import-products/CardList.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/import-products/cards.scss b/plugins/woocommerce-admin/client/task-lists/fills/import-products/cards.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/import-products/cards.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/import-products/cards.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/import-products/importTypes.tsx b/plugins/woocommerce-admin/client/task-lists/fills/import-products/importTypes.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/import-products/importTypes.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/import-products/importTypes.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/import-products/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/import-products/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/import-products/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/import-products/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/import-products/style.scss b/plugins/woocommerce-admin/client/task-lists/fills/import-products/style.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/import-products/style.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/import-products/style.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/import-products/test/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/import-products/test/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/import-products/test/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/import-products/test/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/index.js b/plugins/woocommerce-admin/client/task-lists/fills/index.ts
similarity index 95%
rename from plugins/woocommerce-admin/client/tasks/fills/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/index.ts
index 767469bd3d7..d2805bb7b1e 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/index.js
+++ b/plugins/woocommerce-admin/client/task-lists/fills/index.ts
@@ -9,6 +9,7 @@ import './appearance';
 import './tax';
 import './woocommerce-payments';
 import './purchase';
+import './deprecated-tasks';
 
 const possiblyImportProductTask = async () => {
 	if ( isImportProduct() ) {
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/constants.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/constants.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/constants.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/constants.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/footer.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/footer.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/footer.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/footer.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/icon/lightbulb_24px.js b/plugins/woocommerce-admin/client/task-lists/fills/products/icon/lightbulb_24px.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/icon/lightbulb_24px.js
rename to plugins/woocommerce-admin/client/task-lists/fills/products/icon/lightbulb_24px.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/icon/link_24px.js b/plugins/woocommerce-admin/client/task-lists/fills/products/icon/link_24px.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/icon/link_24px.js
rename to plugins/woocommerce-admin/client/task-lists/fills/products/icon/link_24px.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/icon/widgets_24px.js b/plugins/woocommerce-admin/client/task-lists/fills/products/icon/widgets_24px.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/icon/widgets_24px.js
rename to plugins/woocommerce-admin/client/task-lists/fills/products/icon/widgets_24px.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/index.scss b/plugins/woocommerce-admin/client/task-lists/fills/products/index.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/index.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/products/index.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/stack.scss b/plugins/woocommerce-admin/client/task-lists/fills/products/stack.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/stack.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/products/stack.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/stack.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/stack.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/stack.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/stack.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/test/footer.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/test/footer.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/test/footer.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/test/footer.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/test/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/test/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/test/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/test/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/test/stack.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/test/stack.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/test/stack.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/test/stack.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/test/utils.ts b/plugins/woocommerce-admin/client/task-lists/fills/products/test/utils.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/test/utils.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/products/test/utils.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/use-create-product-by-type.ts b/plugins/woocommerce-admin/client/task-lists/fills/products/use-create-product-by-type.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/use-create-product-by-type.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/products/use-create-product-by-type.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/use-product-types-list-items.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/use-product-types-list-items.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/use-product-types-list-items.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/use-product-types-list-items.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/products/utils.tsx b/plugins/woocommerce-admin/client/task-lists/fills/products/utils.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/products/utils.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/products/utils.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/purchase.js b/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
similarity index 86%
rename from plugins/woocommerce-admin/client/tasks/fills/purchase.js
rename to plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
index 72ae6efcd48..316a82327b5 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/purchase.js
+++ b/plugins/woocommerce-admin/client/task-lists/fills/purchase.tsx
@@ -15,7 +15,13 @@ import { ONBOARDING_STORE_NAME, PLUGINS_STORE_NAME } from '@woocommerce/data';
 import CartModal from '../../dashboard/components/cart-modal';
 import { getCategorizedOnboardingProducts } from '../../dashboard/utils';
 
-const PurchaseTaskItem = ( { defaultTaskItem } ) => {
+type PurchaseTaskItemProps = {
+	defaultTaskItem: React.ComponentType< {
+		onClick: () => void;
+	} >;
+};
+
+const PurchaseTaskItem = ( { defaultTaskItem }: PurchaseTaskItemProps ) => {
 	const [ cartModalOpen, setCartModalOpen ] = useState( false );
 
 	const { installedPlugins, productTypes, profileItems } = useSelect(
@@ -71,7 +77,7 @@ const PurchaseTaskItem = ( { defaultTaskItem } ) => {
 const PurchaseTaskItemFill = () => {
 	return (
 		<WooOnboardingTaskListItem id="purchase">
-			{ ( { defaultTaskItem } ) => (
+			{ ( { defaultTaskItem }: PurchaseTaskItemProps ) => (
 				<PurchaseTaskItem defaultTaskItem={ defaultTaskItem } />
 			) }
 		</WooOnboardingTaskListItem>
@@ -79,6 +85,7 @@ const PurchaseTaskItemFill = () => {
 };
 
 registerPlugin( 'woocommerce-admin-task-purchase', {
+	// @ts-expect-error 'scope' does exist. @types/wordpress__plugins is outdated.
 	scope: 'woocommerce-tasks',
 	render: PurchaseTaskItemFill,
 } );
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/index.js b/plugins/woocommerce-admin/client/task-lists/fills/shipping/index.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/index.js
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/index.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/rates.js b/plugins/woocommerce-admin/client/task-lists/fills/shipping/rates.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/rates.js
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/rates.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/check.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/check.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/check.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/check.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/discount.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/discount.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/discount.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/discount.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/envia-banner-side.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/envia-banner-side.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/envia-banner-side.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/envia-banner-side.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/packlink-banner-side.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/packlink-banner-side.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/packlink-banner-side.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/packlink-banner-side.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/packlink-column-logo.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/packlink-column-logo.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/packlink-column-logo.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/packlink-column-logo.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/paper.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/paper.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/paper.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/paper.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/printer.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/printer.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/printer.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/printer.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/sendcloud-banner-side.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/sendcloud-banner-side.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/sendcloud-banner-side.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/sendcloud-banner-side.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/sendcloud-column-logo.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/sendcloud-column-logo.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/sendcloud-column-logo.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/sendcloud-column-logo.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/shipstation-banner-side.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/shipstation-banner-side.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/shipstation-banner-side.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/shipstation-banner-side.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/shipstation-column-logo.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/shipstation-column-logo.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/shipstation-column-logo.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/shipstation-column-logo.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/shipstation.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/shipstation.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/shipstation.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/shipstation.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/skydropx-banner-side.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/skydropx-banner-side.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/skydropx-banner-side.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/skydropx-banner-side.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/star.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/star.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/star.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/star.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/timer.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/timer.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/timer.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/timer.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/wcs-banner-side.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/wcs-banner-side.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/wcs-banner-side.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/wcs-banner-side.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/wcs.svg b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/wcs.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/assets/wcs.svg
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/assets/wcs.svg
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/partners.tsx b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/partners.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/partners.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/partners.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/shipping-providers.ts b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/shipping-providers.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping-providers/shipping-providers.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping-providers/shipping-providers.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/shipping.scss b/plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/shipping.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/shipping.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/single-partner-features.ts b/plugins/woocommerce-admin/client/task-lists/fills/shipping/single-partner-features.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/shipping/single-partner-features.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/shipping/single-partner-features.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/steps/location.tsx b/plugins/woocommerce-admin/client/task-lists/fills/steps/location.tsx
similarity index 92%
rename from plugins/woocommerce-admin/client/tasks/fills/steps/location.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/steps/location.tsx
index 670f5a5016d..7a0637fac51 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/steps/location.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/fills/steps/location.tsx
@@ -16,7 +16,7 @@ import {
 	getStoreAddressValidator,
 } from '../../../dashboard/components/settings/general/store-address';
 
-type FormValues = {
+export type FormValues = {
 	addressLine1: string;
 	addressLine2: string;
 	countryState: string;
@@ -50,6 +50,12 @@ type StoreLocationProps = {
 	settings?: {
 		[ key: string ]: string;
 	};
+	validate?: ( values: FormValues ) => { [ key: string ]: string };
+};
+
+export const defaultValidate = ( values: FormValues ) => {
+	const validator = getStoreAddressValidator();
+	return validator( values );
 };
 
 const StoreLocation = ( {
@@ -60,6 +66,7 @@ const StoreLocation = ( {
 	updateAndPersistSettingsForGroup,
 	settings,
 	buttonText = __( 'Continue', 'woocommerce' ),
+	validate = defaultValidate,
 }: StoreLocationProps ) => {
 	const { hasFinishedResolution } = useSelect( ( select ) => {
 		const countryStore = select( COUNTRIES_STORE_NAME );
@@ -107,11 +114,6 @@ const StoreLocation = ( {
 		};
 	};
 
-	const validate = ( values: FormValues ) => {
-		const validator = getStoreAddressValidator();
-		return validator( values );
-	};
-
 	if ( isSettingsRequesting || ! hasFinishedResolution ) {
 		return <Spinner />;
 	}
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/avalara/card.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/avalara/card.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/avalara/card.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/avalara/card.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/avalara/logo.png b/plugins/woocommerce-admin/client/task-lists/fills/tax/avalara/logo.png
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/avalara/logo.png
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/avalara/logo.png
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/components/bullet.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/components/bullet.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/components/bullet.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/components/bullet.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/components/partner-card.scss b/plugins/woocommerce-admin/client/task-lists/fills/tax/components/partner-card.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/components/partner-card.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/components/partner-card.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/components/partner-card.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/components/partner-card.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/components/partner-card.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/components/partner-card.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/components/partners.scss b/plugins/woocommerce-admin/client/task-lists/fills/tax/components/partners.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/components/partners.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/components/partners.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/components/partners.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/components/partners.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/components/partners.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/components/partners.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/components/store-location.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/components/store-location.tsx
similarity index 68%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/components/store-location.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/components/store-location.tsx
index 2d0034e0db0..52272acb945 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/tax/components/store-location.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/fills/tax/components/store-location.tsx
@@ -5,13 +5,35 @@ import { SETTINGS_STORE_NAME } from '@woocommerce/data';
 import { recordEvent } from '@woocommerce/tracks';
 import { useEffect } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { getCountryCode } from '~/dashboard/utils';
 import { hasCompleteAddress } from '../utils';
-import { default as StoreLocationForm } from '~/tasks/fills/steps/location';
+import {
+	default as StoreLocationForm,
+	FormValues,
+	defaultValidate,
+} from '~/task-lists/fills/steps/location';
+
+const validateLocationForm = ( values: FormValues ) => {
+	const errors = defaultValidate( values );
+
+	if ( ! values.addressLine1.trim().length ) {
+		errors.addressLine1 = __( 'Please enter an address', 'woocommerce' );
+	}
+
+	if ( ! values.postCode.trim().length ) {
+		errors.postCode = __( 'Please enter a post code', 'woocommerce' );
+	}
+
+	if ( ! values.city.trim().length ) {
+		errors.city = __( 'Please enter a city', 'woocommerce' );
+	}
+	return errors;
+};
 
 export const StoreLocation: React.FC< {
 	nextStep: () => void;
@@ -44,7 +66,12 @@ export const StoreLocation: React.FC< {
 
 	return (
 		<StoreLocationForm
+			validate={ validateLocationForm }
 			onComplete={ ( values: { [ key: string ]: string } ) => {
+				if ( ! hasCompleteAddress( generalSettings || {} ) ) {
+					return;
+				}
+
 				const country = getCountryCode( values.countryState );
 				recordEvent( 'tasklist_tax_set_location', {
 					country,
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/index.tsx
similarity index 96%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/index.tsx
index b42d2d6bf08..4de8b8fbff9 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/tax/index.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/fills/tax/index.tsx
@@ -147,9 +147,9 @@ const Tax: React.FC< TaxProps > = ( { onComplete, query, task } ) => {
 	}, [] );
 
 	const getVisiblePartners = () => {
-		const countryCode = getCountryCode(
-			generalSettings?.woocommerce_default_country
-		);
+		const countryCode =
+			getCountryCode( generalSettings?.woocommerce_default_country ) ||
+			'';
 		const {
 			additionalData: {
 				woocommerceTaxCountries = [],
@@ -164,11 +164,7 @@ const Tax: React.FC< TaxProps > = ( { onComplete, query, task } ) => {
 				component: WooCommerceTax,
 				isVisible:
 					! taxJarActivated && // WCS integration doesn't work with the official TaxJar plugin.
-					woocommerceTaxCountries.includes(
-						getCountryCode(
-							generalSettings?.woocommerce_default_country
-						)
-					),
+					woocommerceTaxCountries.includes( countryCode ),
 			},
 			{
 				id: 'avalara',
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/manual-configuration/configure.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/manual-configuration/configure.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/manual-configuration/configure.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/manual-configuration/configure.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/manual-configuration/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/manual-configuration/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/manual-configuration/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/manual-configuration/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/utils.ts b/plugins/woocommerce-admin/client/task-lists/fills/tax/utils.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/utils.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/utils.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/automated-taxes.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/automated-taxes.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/automated-taxes.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/automated-taxes.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/card.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/card.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/card.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/card.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/connect.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/connect.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/connect.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/connect.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/index.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/logo.png b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/logo.png
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/logo.png
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/logo.png
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/plugins.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/plugins.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/plugins.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/plugins.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/setup.scss b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/setup.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/setup.scss
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/setup.scss
diff --git a/plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/setup.tsx b/plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/setup.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/tax/woocommerce-tax/setup.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/tax/woocommerce-tax/setup.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/fills/use-record-completion-time.ts b/plugins/woocommerce-admin/client/task-lists/fills/use-record-completion-time.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/use-record-completion-time.ts
rename to plugins/woocommerce-admin/client/task-lists/fills/use-record-completion-time.ts
diff --git a/plugins/woocommerce-admin/client/tasks/fills/utils.js b/plugins/woocommerce-admin/client/task-lists/fills/utils.js
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/utils.js
rename to plugins/woocommerce-admin/client/task-lists/fills/utils.js
diff --git a/plugins/woocommerce-admin/client/tasks/fills/woocommerce-payments.tsx b/plugins/woocommerce-admin/client/task-lists/fills/woocommerce-payments.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/fills/woocommerce-payments.tsx
rename to plugins/woocommerce-admin/client/task-lists/fills/woocommerce-payments.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/hooks/useActiveSetupList.ts b/plugins/woocommerce-admin/client/task-lists/hooks/useActiveSetupList.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/hooks/useActiveSetupList.ts
rename to plugins/woocommerce-admin/client/task-lists/hooks/useActiveSetupList.ts
diff --git a/plugins/woocommerce-admin/client/task-lists/index.ts b/plugins/woocommerce-admin/client/task-lists/index.ts
index d09ba9f14e0..79af883a1a3 100644
--- a/plugins/woocommerce-admin/client/task-lists/index.ts
+++ b/plugins/woocommerce-admin/client/task-lists/index.ts
@@ -1,2 +1,10 @@
-export * from './progress-header';
+/**
+ * Internal dependencies
+ */
+import './fills';
+
+export * from './task-lists';
+export * from './reminder-bar';
 export * from './progress-title';
+export * from './components/placeholder';
+export * from './hooks/useActiveSetupList';
diff --git a/plugins/woocommerce-admin/client/task-lists/progress-title/default-progress-title.tsx b/plugins/woocommerce-admin/client/task-lists/progress-title/default-progress-title.tsx
index 2ff0496b65b..af99e652f40 100644
--- a/plugins/woocommerce-admin/client/task-lists/progress-title/default-progress-title.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/progress-title/default-progress-title.tsx
@@ -55,7 +55,7 @@ export const DefaultProgressTitle: React.FC< DefaultProgressTitleProps > = ( {
 				  )
 				: __( 'Welcome to your store', 'woocommerce' );
 		}
-		if ( completedCount > 0 && completedCount < 4 ) {
+		if ( completedCount <= 3 ) {
 			return __( "Let's get you started", 'woocommerce' ) + '   🚀';
 		}
 		if ( completedCount > 3 && completedCount < 6 ) {
diff --git a/plugins/woocommerce-admin/client/task-lists/progress-title/test/default-progress-title.test.tsx b/plugins/woocommerce-admin/client/task-lists/progress-title/test/default-progress-title.test.tsx
new file mode 100644
index 00000000000..be4dcce3081
--- /dev/null
+++ b/plugins/woocommerce-admin/client/task-lists/progress-title/test/default-progress-title.test.tsx
@@ -0,0 +1,110 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { DefaultProgressTitle } from '../default-progress-title';
+
+jest.mock( '@wordpress/data', () => ( {
+	...jest.requireActual( '@wordpress/data' ),
+	useSelect: jest.fn(),
+} ) );
+
+describe( 'default-progress-title', () => {
+	( useSelect as jest.Mock ).mockImplementation( ( fn ) =>
+		fn( () => ( {
+			getTaskList: () => ( {
+				tasks: [],
+			} ),
+			hasFinishedResolution: () => true,
+		} ) )
+	);
+
+	it( 'should render "Welcome to your store" when no tasks are completed and visited', () => {
+		render( <DefaultProgressTitle taskListId="1" /> );
+		expect(
+			screen.getByText( 'Welcome to your store' )
+		).toBeInTheDocument();
+	} );
+
+	it( 'should render "Welcome to your store" when all tasks are completed', () => {
+		( useSelect as jest.Mock ).mockImplementation( ( fn ) =>
+			fn( () => ( {
+				getTaskList: () => ( {
+					tasks: [
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+					],
+				} ),
+				hasFinishedResolution: () => true,
+			} ) )
+		);
+		render( <DefaultProgressTitle taskListId="1" /> );
+		expect(
+			screen.getByText( 'Welcome to your store' )
+		).toBeInTheDocument();
+	} );
+
+	it( 'should render "Let\'s get you started" when has task visited and task completed count <= 3', () => {
+		( useSelect as jest.Mock ).mockImplementation( ( fn ) =>
+			fn( () => ( {
+				getTaskList: () => ( {
+					tasks: [ { isVisited: true, isComplete: false } ],
+				} ),
+				hasFinishedResolution: () => true,
+			} ) )
+		);
+		render( <DefaultProgressTitle taskListId="1" /> );
+		expect(
+			screen.getByText( "Let's get you started", { exact: false } )
+		).toBeInTheDocument();
+	} );
+
+	it( 'should render "You are on the right track" when has task visited and task completed count > 3', () => {
+		( useSelect as jest.Mock ).mockImplementation( ( fn ) =>
+			fn( () => ( {
+				getTaskList: () => ( {
+					tasks: [
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: false },
+					],
+				} ),
+				hasFinishedResolution: () => true,
+			} ) )
+		);
+		render( <DefaultProgressTitle taskListId="1" /> );
+		expect(
+			screen.getByText( 'You are on the right track', { exact: false } )
+		).toBeInTheDocument();
+	} );
+
+	it( 'should render "You are almost there" when has task visited and task completed count > 5', () => {
+		( useSelect as jest.Mock ).mockImplementation( ( fn ) =>
+			fn( () => ( {
+				getTaskList: () => ( {
+					tasks: [
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: true },
+						{ isVisited: true, isComplete: false },
+					],
+				} ),
+				hasFinishedResolution: () => true,
+			} ) )
+		);
+		render( <DefaultProgressTitle taskListId="1" /> );
+		expect(
+			screen.getByText( 'You are almost there', { exact: false } )
+		).toBeInTheDocument();
+	} );
+} );
diff --git a/plugins/woocommerce-admin/client/tasks/reminder-bar/index.tsx b/plugins/woocommerce-admin/client/task-lists/reminder-bar/index.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/reminder-bar/index.tsx
rename to plugins/woocommerce-admin/client/task-lists/reminder-bar/index.tsx
diff --git a/plugins/woocommerce-admin/client/tasks/reminder-bar/reminder-bar.scss b/plugins/woocommerce-admin/client/task-lists/reminder-bar/reminder-bar.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/reminder-bar/reminder-bar.scss
rename to plugins/woocommerce-admin/client/task-lists/reminder-bar/reminder-bar.scss
diff --git a/plugins/woocommerce-admin/client/tasks/reminder-bar/reminder-bar.tsx b/plugins/woocommerce-admin/client/task-lists/reminder-bar/reminder-bar.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/reminder-bar/reminder-bar.tsx
rename to plugins/woocommerce-admin/client/task-lists/reminder-bar/reminder-bar.tsx
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/completed-celebration-header.svg b/plugins/woocommerce-admin/client/task-lists/setup-task-list/assets/completed-celebration-header.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/completed-celebration-header.svg
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/assets/completed-celebration-header.svg
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/completed.svg b/plugins/woocommerce-admin/client/task-lists/setup-task-list/assets/task-list-completed.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/completed.svg
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/assets/task-list-completed.svg
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/dismiss-modal.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/dismiss-modal.tsx
similarity index 91%
rename from plugins/woocommerce-admin/client/two-column-tasks/dismiss-modal.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/dismiss-modal.tsx
index c0efa717603..cec59c4ffd7 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/dismiss-modal.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/dismiss-modal.tsx
@@ -8,6 +8,10 @@ const DismissModal = ( {
 	showDismissModal,
 	setShowDismissModal,
 	hideTasks,
+}: {
+	showDismissModal: boolean;
+	setShowDismissModal: ( show: boolean ) => void;
+	hideTasks: ( task: string ) => void;
 } ) => {
 	const closeModal = () => setShowDismissModal( false );
 	const title = __( 'Hide store setup tasks', 'woocommerce' );
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/appearance.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/appearance.js
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/appearance.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/appearance.js
index a247eb3b75a..836d264fd9d 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/appearance.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/appearance.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const AppearanceHeader = ( { task, goToTask } ) => {
 	return (
diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/index.ts b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/index.ts
new file mode 100644
index 00000000000..c8f3d548b65
--- /dev/null
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/index.ts
@@ -0,0 +1,24 @@
+/**
+ * Internal dependencies
+ */
+import StoreDetailsHeader from './store-details';
+import TaxHeader from './tax';
+import MarketingHeader from './marketing';
+import AppearanceHeader from './appearance';
+import ShippingHeader from './shipping';
+import ProductsHeader from './products';
+import PurchaseHeader from './purchase';
+import PaymentsHeader from './payments';
+import WoocommercePaymentsHeader from './woocommerce-payments';
+
+export const taskHeaders: Record< string, React.ElementType > = {
+	store_details: StoreDetailsHeader,
+	tax: TaxHeader,
+	shipping: ShippingHeader,
+	marketing: MarketingHeader,
+	appearance: AppearanceHeader,
+	payments: PaymentsHeader,
+	products: ProductsHeader,
+	purchase: PurchaseHeader,
+	'woocommerce-payments': WoocommercePaymentsHeader,
+};
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/marketing.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/marketing.js
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/marketing.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/marketing.js
index a918573935f..120c95a150d 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/marketing.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/marketing.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const MarketingHeader = ( { task, goToTask } ) => {
 	return (
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/payments.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/payments.js
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/payments.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/payments.js
index 21cabcd4559..5bd6edeaedd 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/payments.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/payments.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const PaymentsHeader = ( { task, goToTask } ) => {
 	return (
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/products.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/products.js
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/products.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/products.js
index 3af8e77e3e9..11b42c4a94b 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/products.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/products.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const ProductsHeader = ( { task, goToTask } ) => {
 	return (
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/purchase.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/purchase.js
similarity index 96%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/purchase.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/purchase.js
index a84c1e46c2a..2cc7eb2726d 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/purchase.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/purchase.js
@@ -11,7 +11,7 @@ import { recordEvent } from '@woocommerce/tracks';
  */
 import CartModal from '~/dashboard/components/cart-modal';
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const PurchaseHeader = ( { task } ) => {
 	const [ cartModalOpen, setCartModalOpen ] = useState( false );
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/shipping.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/shipping.js
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/shipping.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/shipping.js
index eaeb4238d39..42cf8d7552c 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/shipping.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/shipping.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const ShippingHeader = ( { task, goToTask } ) => {
 	return (
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/store-details.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/store-details.js
similarity index 95%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/store-details.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/store-details.js
index 3b6f25504eb..6ae25d25710 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/store-details.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/store-details.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const StoreDetailsHeader = ( { task, goToTask } ) => {
 	return (
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/tax.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/tax.js
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/tax.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/tax.js
index 72cc65e8db1..6bab840e9fe 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/tax.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/tax.js
@@ -8,7 +8,7 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '../../../../utils/admin-settings';
 
 const TaxHeader = ( { task, goToTask } ) => {
 	return (
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/timer.svg b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/timer.svg
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/timer.svg
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/timer.svg
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/headers/woocommerce-payments.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/woocommerce-payments.js
similarity index 97%
rename from plugins/woocommerce-admin/client/two-column-tasks/headers/woocommerce-payments.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/woocommerce-payments.js
index b47ae6f423f..abf8bbdf2d0 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/headers/woocommerce-payments.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-headers/woocommerce-payments.js
@@ -14,7 +14,7 @@ import interpolateComponents from '@automattic/interpolate-components';
  * Internal dependencies
  */
 import TimerImage from './timer.svg';
-import { WC_ASSET_URL } from '../../utils/admin-settings';
+import { WC_ASSET_URL } from '~/utils/admin-settings';
 
 const connect = ( createNotice, setIsBusy ) => {
 	const errorMessage = __(
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/completed-header.scss b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/completed-header.scss
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.scss
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/completed-header.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.tsx
similarity index 97%
rename from plugins/woocommerce-admin/client/two-column-tasks/completed-header.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.tsx
index a3e94b33d2c..93db998f16e 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/completed-header.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed-header.tsx
@@ -21,8 +21,8 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import './completed-header.scss';
-import HeaderImage from './completed-celebration-header.svg';
+import './task-list-completed-header.scss';
+import HeaderImage from '../assets/completed-celebration-header.svg';
 
 type TaskListCompletedHeaderProps = {
 	hideTasks: () => void;
@@ -149,7 +149,7 @@ export const TaskListCompletedHeader: React.FC<
 		<>
 			<div
 				className={ classnames(
-					'woocommerce-task-dashboard__container two-column-experiment'
+					'woocommerce-task-dashboard__container setup-task-list'
 				) }
 			>
 				<Card
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/completed.js b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed.tsx
similarity index 78%
rename from plugins/woocommerce-admin/client/two-column-tasks/completed.js
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed.tsx
index 35d3e772b76..a87a6a23deb 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/completed.js
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-completed.tsx
@@ -8,16 +8,20 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import '../tasks/task-list.scss';
-import HeaderImage from './completed.svg';
+import HeaderImage from '../assets/task-list-completed.svg';
 
-export const TaskListCompleted = ( { twoColumns, hideTasks, keepTasks } ) => {
+export const TaskListCompleted = ( {
+	hideTasks,
+	keepTasks,
+}: {
+	hideTasks: () => void;
+	keepTasks: () => void;
+} ) => {
 	return (
 		<>
 			<div
 				className={ classnames(
-					'woocommerce-task-dashboard__container two-column-experiment',
-					{ 'two-columns': twoColumns !== false }
+					'woocommerce-task-dashboard__container setup-task-list'
 				) }
 			>
 				<Card
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/task-list-item-two-column.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-item.tsx
similarity index 97%
rename from plugins/woocommerce-admin/client/two-column-tasks/task-list-item-two-column.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-item.tsx
index 211853559e1..ff290f4bbe7 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/task-list-item-two-column.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-item.tsx
@@ -18,7 +18,7 @@ export type TaskListItemProps = {
 	trackClick: () => void;
 };
 
-export const TaskListItemTwoColumn: React.FC< TaskListItemProps > = ( {
+export const TaskListItem: React.FC< TaskListItemProps > = ( {
 	task,
 	activeTaskId,
 	taskIndex,
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/placeholder.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-placeholder.tsx
similarity index 79%
rename from plugins/woocommerce-admin/client/two-column-tasks/placeholder.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-placeholder.tsx
index 2cbea8720db..3cc44fc55c9 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/placeholder.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/components/task-list-placeholder.tsx
@@ -6,7 +6,6 @@ import classnames from 'classnames';
 /**
  * Internal dependencies
  */
-import './style.scss';
 
 type TasksPlaceholderProps = {
 	numTasks?: number;
@@ -16,15 +15,16 @@ type TasksPlaceholderProps = {
 	};
 };
 
-const TaskListPlaceholder: React.FC< TasksPlaceholderProps > = ( props ) => {
-	const { numTasks = 5, twoColumns = false } = props;
+export const TaskListPlaceholder: React.FC< TasksPlaceholderProps > = (
+	props
+) => {
+	const { numTasks = 5 } = props;
 
 	return (
 		<div
-			className={ classnames( 'woocommerce-task-dashboard__container', {
-				'two-columns': twoColumns,
-				'two-column-experiment': true,
-			} ) }
+			className={ classnames(
+				'woocommerce-task-dashboard__container setup-task-list'
+			) }
 		>
 			<div className="components-card is-size-large woocommerce-task-card woocommerce-homescreen-card is-loading">
 				<div className="components-card__header is-size-medium">
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/footer-slot/footer-slot.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/footer-slot/footer-slot.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/footer-slot/footer-slot.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/footer-slot/footer-slot.tsx
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/footer-slot/index.ts b/plugins/woocommerce-admin/client/task-lists/setup-task-list/footer-slot/index.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/footer-slot/index.ts
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/footer-slot/index.ts
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/footer-slot/utils.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/footer-slot/utils.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/footer-slot/utils.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/footer-slot/utils.tsx
diff --git a/plugins/woocommerce-admin/client/task-lists/setup-task-list/index.ts b/plugins/woocommerce-admin/client/task-lists/setup-task-list/index.ts
new file mode 100644
index 00000000000..ea833dd9351
--- /dev/null
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/index.ts
@@ -0,0 +1,2 @@
+export * from './setup-task-list';
+export * from './components/task-list-placeholder';
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/task-list.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/setup-task-list.tsx
similarity index 92%
rename from plugins/woocommerce-admin/client/two-column-tasks/task-list.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/setup-task-list.tsx
index e11fc9bd392..d6da84ecd61 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/task-list.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/setup-task-list.tsx
@@ -24,13 +24,12 @@ import { useLayoutContext } from '@woocommerce/admin-layout';
 /**
  * Internal dependencies
  */
-import '../tasks/task-list.scss';
-import taskHeaders from './task-headers';
-import DismissModal from './dismiss-modal';
-import TaskListCompleted from './completed';
-import { ProgressHeader } from '~/task-lists/progress-header';
-import { TaskListItemTwoColumn } from './task-list-item-two-column';
-import { TaskListCompletedHeader } from './completed-header';
+import { taskHeaders } from './components/task-headers';
+import DismissModal from './components/dismiss-modal';
+import TaskListCompleted from './components/task-list-completed';
+import { ProgressHeader } from '~/task-lists/components/progress-header';
+import { TaskListItem } from './components/task-list-item';
+import { TaskListCompletedHeader } from './components/task-list-completed-header';
 
 import { ExperimentalWooTaskListFooter } from './footer-slot';
 import {
@@ -40,20 +39,18 @@ import {
 
 export type TaskListProps = TaskListType & {
 	eventName?: string;
-	twoColumns?: boolean;
 	query: {
 		task?: string;
 	};
 	cesHeader?: boolean;
 };
 
-export const TaskList: React.FC< TaskListProps > = ( {
+export const SetupTaskList: React.FC< TaskListProps > = ( {
 	query,
 	id,
 	eventName,
 	eventPrefix,
 	tasks,
-	twoColumns,
 	keepCompletedTaskList,
 	isComplete,
 	displayProgressHeader,
@@ -271,7 +268,6 @@ export const TaskList: React.FC< TaskListProps > = ( {
 					<TaskListCompleted
 						hideTasks={ hideTasks }
 						keepTasks={ keepTasks }
-						twoColumns={ false }
 					/>
 				) }
 			</>
@@ -292,8 +288,7 @@ export const TaskList: React.FC< TaskListProps > = ( {
 			) : null }
 			<div
 				className={ classnames(
-					`woocommerce-task-dashboard__container two-column-experiment woocommerce-task-list__${ id }`,
-					{ 'two-columns': twoColumns !== false }
+					`woocommerce-task-dashboard__container woocommerce-task-list__${ id } setup-task-list`
 				) }
 			>
 				<Card
@@ -320,7 +315,7 @@ export const TaskList: React.FC< TaskListProps > = ( {
 					<List animation="custom">
 						{ visibleTasks.map( ( task, index ) => {
 							return (
-								<TaskListItemTwoColumn
+								<TaskListItem
 									key={ task.id }
 									taskIndex={ ++index }
 									activeTaskId={ activeTaskId }
@@ -338,4 +333,4 @@ export const TaskList: React.FC< TaskListProps > = ( {
 	);
 };
 
-export default TaskList;
+export default SetupTaskList;
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/style.scss b/plugins/woocommerce-admin/client/task-lists/setup-task-list/style.scss
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/style.scss
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/style.scss
index ed430c7d43e..b92bd129595 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/style.scss
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/style.scss
@@ -95,13 +95,7 @@
 	}
 }
 
-.two-columns .woocommerce-task-dashboard__container.two-column-experiment {
-	.svg-background {
-		top: 15%;
-	}
-}
-
-.woocommerce-task-dashboard__container.two-column-experiment {
+.woocommerce-task-dashboard__container.setup-task-list {
 	max-width: 1032px;
 	display: flex;
 	flex-direction: row;
@@ -150,19 +144,8 @@
 		}
 	}
 
-	&:not(.two-columns) {
-		@include single-column;
-	}
-
-	&.two-columns .svg-background {
-		top: 50%;
-		bottom: 50%;
-		margin-top: auto;
-		margin-bottom: auto;
-	}
 
 	ul {
-		display: flex;
 		li {
 			display: block;
 			width: 100%;
@@ -217,6 +200,9 @@
 		width: 100%;
 	}
 
+	@include single-column;
+
+
 	@for $i from 1 through 10 {
 		.woocommerce-task-list__item:not(.complete).index-#{$i} .woocommerce-task__icon::after {
 			content: '#{$i}';
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/task-list-completion-slot/index.ts b/plugins/woocommerce-admin/client/task-lists/setup-task-list/task-list-completion-slot/index.ts
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/task-list-completion-slot/index.ts
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/task-list-completion-slot/index.ts
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/task-list-completion-slot/task-list-completion-slot.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/task-list-completion-slot/task-list-completion-slot.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/task-list-completion-slot/task-list-completion-slot.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/task-list-completion-slot/task-list-completion-slot.tsx
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/task-list-completion-slot/utils.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/task-list-completion-slot/utils.tsx
similarity index 100%
rename from plugins/woocommerce-admin/client/two-column-tasks/task-list-completion-slot/utils.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/task-list-completion-slot/utils.tsx
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/test/task-list.test.tsx b/plugins/woocommerce-admin/client/task-lists/setup-task-list/test/setup-task-list.test.tsx
similarity index 94%
rename from plugins/woocommerce-admin/client/two-column-tasks/test/task-list.test.tsx
rename to plugins/woocommerce-admin/client/task-lists/setup-task-list/test/setup-task-list.test.tsx
index a55570387e5..2624c30ccfc 100644
--- a/plugins/woocommerce-admin/client/two-column-tasks/test/task-list.test.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/setup-task-list/test/setup-task-list.test.tsx
@@ -8,7 +8,7 @@ import { TaskType } from '@woocommerce/data';
 /**
  * Internal dependencies
  */
-import { TaskList } from '../task-list';
+import { SetupTaskList } from '../setup-task-list';
 
 jest.mock( '@woocommerce/tracks', () => ( {
 	recordEvent: jest.fn(),
@@ -27,10 +27,12 @@ jest.mock( '@woocommerce/components', () => ( {
 		.fn()
 		.mockImplementation( () => <div>task_list_menu</div> ),
 } ) );
-jest.mock( '../task-headers', () => ( {
-	optional: () => <div>optional_header</div>,
-	required: () => <div>required_header</div>,
-	completed: () => <div>completed_header</div>,
+jest.mock( '../components/task-headers', () => ( {
+	taskHeaders: {
+		optional: () => <div>optional_header</div>,
+		required: () => <div>required_header</div>,
+		completed: () => <div>completed_header</div>,
+	},
 } ) );
 jest.mock( '@woocommerce/data', () => ( {
 	...jest.requireActual( '@woocommerce/data' ),
@@ -155,7 +157,7 @@ describe( 'TaskList', () => {
 
 	it( 'should trigger tasklist_view event on initial render for setup task list', () => {
 		render(
-			<TaskList
+			<SetupTaskList
 				id="setup"
 				eventName="tasklist"
 				tasks={ [] }
@@ -179,7 +181,7 @@ describe( 'TaskList', () => {
 
 	it( 'should trigger tasklist_view event on initial render for setup task list with eventPrefix if eventName is undefined', () => {
 		render(
-			<TaskList
+			<SetupTaskList
 				id="setup"
 				tasks={ [] }
 				title="List title"
@@ -202,7 +204,7 @@ describe( 'TaskList', () => {
 
 	it( 'should trigger {id}_tasklist_view event on initial render for setup task list if id is not setup', () => {
 		render(
-			<TaskList
+			<SetupTaskList
 				id="extended"
 				eventName="extended_tasklist"
 				tasks={ [] }
@@ -226,7 +228,7 @@ describe( 'TaskList', () => {
 
 	it( 'should render the task header of the first uncompleted task', () => {
 		const { queryByText } = render(
-			<TaskList
+			<SetupTaskList
 				id="extended"
 				tasks={ [ ...tasks.setup ] }
 				title="List title"
@@ -244,7 +246,7 @@ describe( 'TaskList', () => {
 
 	it( 'should render all tasks', () => {
 		const { queryByText } = render(
-			<TaskList
+			<SetupTaskList
 				id="extended"
 				tasks={ [ ...tasks.setup ] }
 				title="List title"
@@ -265,7 +267,7 @@ describe( 'TaskList', () => {
 	it( 'should not display isDismissed tasks', () => {
 		const dismissedTask = [ { ...tasks.setup[ 0 ], isDismissed: true } ];
 		const { queryByText } = render(
-			<TaskList
+			<SetupTaskList
 				id="extended"
 				tasks={ dismissedTask }
 				title="List title"
diff --git a/plugins/woocommerce-admin/client/tasks/tasks.scss b/plugins/woocommerce-admin/client/task-lists/task-lists.scss
similarity index 100%
rename from plugins/woocommerce-admin/client/tasks/tasks.scss
rename to plugins/woocommerce-admin/client/task-lists/task-lists.scss
diff --git a/plugins/woocommerce-admin/client/tasks/tasks.tsx b/plugins/woocommerce-admin/client/task-lists/task-lists.tsx
similarity index 85%
rename from plugins/woocommerce-admin/client/tasks/tasks.tsx
rename to plugins/woocommerce-admin/client/task-lists/task-lists.tsx
index fae9ca7a7b1..de363651475 100644
--- a/plugins/woocommerce-admin/client/tasks/tasks.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/task-lists.tsx
@@ -19,21 +19,23 @@ import { recordEvent } from '@woocommerce/tracks';
  * Internal dependencies
  */
 import { DisplayOption } from '~/activity-panel/display-options';
-import { Task } from './task';
-import { TasksPlaceholder } from './placeholder';
-import './tasks.scss';
-import { TaskList } from './task-list';
-import { TaskList as TwoColumnTaskList } from '../two-column-tasks/task-list';
-import TwoColumnTaskListPlaceholder from '../two-column-tasks/placeholder';
-import '../two-column-tasks/style.scss';
+import './task-lists.scss';
+import {
+	SetupTaskList,
+	TaskListPlaceholder as SetupTaskListPlaceholder,
+} from './setup-task-list';
+import './setup-task-list/style.scss';
+import { Task } from './components/task';
+import { TasksPlaceholder } from './components/placeholder';
+import { TaskList } from './components/task-list';
 import { getAdminSetting } from '~/utils/admin-settings';
 
-export type TasksProps = {
+export type TaskListsProps = {
 	query: { task?: string };
 	context?: string;
 };
 
-export const Tasks: React.FC< TasksProps > = ( { query } ) => {
+export const TaskLists: React.FC< TaskListsProps > = ( { query } ) => {
 	const { task } = query;
 	const { hideTaskList } = useDispatch( ONBOARDING_STORE_NAME );
 	const { updateOptions } = useDispatch( OPTIONS_STORE_NAME );
@@ -108,7 +110,7 @@ export const Tasks: React.FC< TasksProps > = ( { query } ) => {
 	const taskListIds = getAdminSetting( 'visibleTaskListIds', [] );
 	const TaskListPlaceholderComponent =
 		taskListIds[ 0 ] === 'setup'
-			? TwoColumnTaskListPlaceholder
+			? SetupTaskListPlaceholder
 			: TasksPlaceholder;
 
 	if ( isResolving ) {
@@ -118,21 +120,17 @@ export const Tasks: React.FC< TasksProps > = ( { query } ) => {
 	return (
 		<>
 			{ taskLists
-				.filter(
-					( { id }: TaskListType ) => ! id.endsWith( 'two_column' )
-				)
 				.filter( ( { isVisible }: TaskListType ) => isVisible )
 				.map( ( taskList: TaskListType ) => {
 					const { id, isHidden, isToggleable } = taskList;
 					const TaskListComponent =
-						id === 'setup' ? TwoColumnTaskList : TaskList;
+						id === 'setup' ? SetupTaskList : TaskList;
 
 					return (
 						<Fragment key={ id }>
 							<TaskListComponent
 								isExpandable={ false }
 								query={ query }
-								twoColumns={ false }
 								{ ...taskList }
 							/>
 							{ isToggleable && (
diff --git a/plugins/woocommerce-admin/client/tasks/test/tasks.test.tsx b/plugins/woocommerce-admin/client/task-lists/test/tasks.test.tsx
similarity index 85%
rename from plugins/woocommerce-admin/client/tasks/test/tasks.test.tsx
rename to plugins/woocommerce-admin/client/task-lists/test/tasks.test.tsx
index 583c04e1688..666146ddfb5 100644
--- a/plugins/woocommerce-admin/client/tasks/test/tasks.test.tsx
+++ b/plugins/woocommerce-admin/client/task-lists/test/tasks.test.tsx
@@ -9,10 +9,10 @@ import userEvent from '@testing-library/user-event';
 /**
  * Internal dependencies
  */
-import { Tasks } from '../tasks';
-import { TaskProps } from '../task';
-import { TaskListProps } from '../task-list';
-import { TaskListProps as TwoColumnTaskListProps } from '../../two-column-tasks/task-list';
+import { TaskLists } from '../task-lists';
+import { TaskProps } from '../components/task';
+import { TaskListProps } from '../components/task-list';
+import { TaskListProps as SetupTaskListProps } from '../setup-task-list/setup-task-list';
 
 jest.mock( '@wordpress/data', () => {
 	// Require the original module to not be mocked...
@@ -29,21 +29,21 @@ jest.mock( '@wordpress/data', () => {
 jest.mock( '@woocommerce/explat' );
 jest.mock( '@woocommerce/tracks' );
 
-jest.mock( '../task-list', () => ( {
+jest.mock( '../components/task-list', () => ( {
 	TaskList: ( { id }: TaskListProps ) => <div>task-list:{ id }</div>,
 } ) );
 
-jest.mock( '../../two-column-tasks/task-list', () => ( {
-	TaskList: ( { id }: TwoColumnTaskListProps ) => (
-		<div>two-column-list:{ id }</div>
+jest.mock( '../setup-task-list', () => ( {
+	SetupTaskList: ( { id }: SetupTaskListProps ) => (
+		<div>setup-task-list:{ id }</div>
 	),
 } ) );
 
-jest.mock( '../task', () => ( {
+jest.mock( '../components/task', () => ( {
 	Task: ( { query }: TaskProps ) => <div>task:{ query.task }</div>,
 } ) );
 
-jest.mock( '../placeholder', () => ( {
+jest.mock( '../components/placeholder', () => ( {
 	TasksPlaceholder: () => <div>task-placeholder</div>,
 } ) );
 
@@ -83,14 +83,14 @@ describe( 'Task', () => {
 	it( 'should render if no current task and finished resolving', () => {
 		const { queryByText } = render(
 			<div>
-				<Tasks query={ {} } />
+				<TaskLists query={ {} } />
 			</div>
 		);
 		waitFor( () => {
 			expect( queryByText( 'task-list:main' ) ).toBeInTheDocument();
 			expect( queryByText( 'task-list:extended' ) ).toBeInTheDocument();
 			expect(
-				queryByText( 'two-column-list:setup' )
+				queryByText( 'setup-task-list:setup' )
 			).not.toBeInTheDocument();
 		} );
 	} );
@@ -98,7 +98,7 @@ describe( 'Task', () => {
 	it( 'should render the task component if query has an existing task', () => {
 		const { queryByText } = render(
 			<div>
-				<Tasks query={ { task: 'main-task-1' } } />
+				<TaskLists query={ { task: 'main-task-1' } } />
 			</div>
 		);
 		expect( queryByText( 'task:main-task-1' ) ).toBeInTheDocument();
@@ -107,7 +107,7 @@ describe( 'Task', () => {
 	it( 'should not render anything if query has task, but task does not exist', () => {
 		const { queryByText } = render(
 			<div>
-				<Tasks query={ { task: 'main-task-random' } } />
+				<TaskLists query={ { task: 'main-task-random' } } />
 			</div>
 		);
 		expect(
@@ -122,7 +122,7 @@ describe( 'Task', () => {
 		} ) );
 		const { queryByText } = render(
 			<div>
-				<Tasks query={ {} } />
+				<TaskLists query={ {} } />
 			</div>
 		);
 		expect( queryByText( 'task-placeholder' ) ).toBeInTheDocument();
@@ -144,7 +144,7 @@ describe( 'Task', () => {
 		} ) );
 		const { queryByText } = render(
 			<div>
-				<Tasks query={ {} } />
+				<TaskLists query={ {} } />
 			</div>
 		);
 		expect( queryByText( 'Show things to do next' ) ).toBeInTheDocument();
@@ -153,7 +153,7 @@ describe( 'Task', () => {
 	it( 'should class updateOptions with default data on render', () => {
 		render(
 			<div>
-				<Tasks query={ {} } />
+				<TaskLists query={ {} } />
 			</div>
 		);
 		waitFor( () => {
@@ -180,7 +180,7 @@ describe( 'Task', () => {
 			} ) );
 			const { getByText } = render(
 				<div>
-					<Tasks query={ {} } />
+					<TaskLists query={ {} } />
 				</div>
 			);
 			act( () => {
@@ -209,7 +209,7 @@ describe( 'Task', () => {
 			} ) );
 			const { getByText } = render(
 				<div>
-					<Tasks query={ {} } />
+					<TaskLists query={ {} } />
 				</div>
 			);
 			act( () => {
diff --git a/plugins/woocommerce-admin/client/tasks/index.ts b/plugins/woocommerce-admin/client/tasks/index.ts
deleted file mode 100644
index 965ee2d89d9..00000000000
--- a/plugins/woocommerce-admin/client/tasks/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Internal dependencies
- */
-import './fills';
-import './deprecated-tasks';
-
-export * from './tasks';
-export * from './placeholder';
-export * from './reminder-bar';
-export * from './hooks/useActiveSetupList';
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/extended-task.tsx b/plugins/woocommerce-admin/client/two-column-tasks/extended-task.tsx
deleted file mode 100644
index dd0bc2df026..00000000000
--- a/plugins/woocommerce-admin/client/two-column-tasks/extended-task.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * External dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { MenuGroup, MenuItem } from '@wordpress/components';
-import { check } from '@wordpress/icons';
-import { Fragment, useEffect } from '@wordpress/element';
-import { useDispatch, useSelect } from '@wordpress/data';
-import {
-	ONBOARDING_STORE_NAME,
-	OPTIONS_STORE_NAME,
-	TaskListType,
-	TaskType,
-} from '@woocommerce/data';
-import { recordEvent } from '@woocommerce/tracks';
-
-/**
- * Internal dependencies
- */
-import { DisplayOption } from '~/activity-panel/display-options';
-import { TaskList } from '../tasks/task-list';
-import { TasksPlaceholder } from '../tasks/placeholder';
-import '../tasks/tasks.scss';
-
-export type TasksProps = {
-	query: { task?: string };
-};
-
-const ExtendedTask: React.FC< TasksProps > = ( { query } ) => {
-	const { hideTaskList } = useDispatch( ONBOARDING_STORE_NAME );
-	const { updateOptions } = useDispatch( OPTIONS_STORE_NAME );
-	const { task } = query;
-
-	const {
-		isResolving,
-		taskLists,
-	}: {
-		isResolving: boolean;
-		taskLists: TaskListType[];
-	} = useSelect( ( select ) => {
-		return {
-			isResolving: select( ONBOARDING_STORE_NAME ).isResolving(
-				'getTaskListsByIds'
-			),
-			taskLists: select( ONBOARDING_STORE_NAME ).getTaskListsByIds( [
-				'extended_two_column',
-			] ),
-		};
-	} );
-	const toggleTaskList = ( taskList: TaskListType ) => {
-		const { id, isHidden } = taskList;
-		const newValue = ! isHidden;
-
-		recordEvent(
-			newValue ? `${ id }_tasklist_hide` : `${ id }_tasklist_show`,
-			{}
-		);
-
-		hideTaskList( id );
-	};
-
-	useEffect( () => {
-		updateOptions( {
-			woocommerce_task_list_prompt_shown: true,
-		} );
-	}, [ taskLists, isResolving ] );
-
-	// If a task detail is being shown, we shouldn't show the extended tasklist.
-	if ( task ) {
-		return null;
-	}
-
-	if ( isResolving ) {
-		return <TasksPlaceholder query={ query } />;
-	}
-
-	const extendedTaskList = taskLists[ 0 ];
-
-	if ( ! extendedTaskList || extendedTaskList.tasks.length === 0 ) {
-		return null;
-	}
-
-	const completedTasks = extendedTaskList.tasks.filter(
-		( extendedTaskListTask: TaskType ) => {
-			return extendedTaskListTask.isComplete;
-		}
-	);
-
-	// Use custom isComplete since we're manually adding tasks
-	// to the extended task list.
-	const isComplete = completedTasks.length === extendedTaskList.tasks.length;
-
-	const {
-		id,
-		eventPrefix,
-		isHidden,
-		isVisible,
-		isToggleable,
-		title,
-		tasks,
-		displayProgressHeader,
-		keepCompletedTaskList,
-	} = extendedTaskList;
-
-	if ( ! isVisible ) {
-		return null;
-	}
-
-	return (
-		<Fragment key={ id }>
-			<TaskList
-				query={ query }
-				id={ id }
-				eventPrefix={ eventPrefix }
-				isComplete={ isComplete }
-				tasks={ tasks }
-				title={ title }
-				isHidden={ isHidden }
-				isVisible={ isVisible }
-				displayProgressHeader={ displayProgressHeader }
-				keepCompletedTaskList={ keepCompletedTaskList }
-			/>
-			{ isToggleable && (
-				<DisplayOption>
-					<MenuGroup
-						className="woocommerce-layout__homescreen-display-options"
-						label={ __( 'Display', 'woocommerce' ) }
-					>
-						<MenuItem
-							className="woocommerce-layout__homescreen-extension-tasklist-toggle"
-							icon={ isHidden ? undefined : check }
-							isSelected={ ! isHidden }
-							role="menuitemcheckbox"
-							onClick={ () => toggleTaskList( extendedTaskList ) }
-						>
-							{ __( 'Show things to do next', 'woocommerce' ) }
-						</MenuItem>
-					</MenuGroup>
-				</DisplayOption>
-			) }
-		</Fragment>
-	);
-};
-
-export default ExtendedTask;
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/index.js b/plugins/woocommerce-admin/client/two-column-tasks/index.js
deleted file mode 100644
index 81c8ca7203a..00000000000
--- a/plugins/woocommerce-admin/client/two-column-tasks/index.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * External dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
-import { ONBOARDING_STORE_NAME } from '@woocommerce/data';
-
-/**
- * Internal dependencies
- */
-import '../tasks/tasks.scss';
-import './style.scss';
-import TaskList from './task-list';
-import TaskListPlaceholder from './placeholder';
-import { Task } from '../tasks/task';
-
-const TaskDashboard = ( { query, twoColumns } ) => {
-	const { task } = query;
-
-	const { isResolving, taskLists } = useSelect( ( select ) => {
-		return {
-			taskLists: select( ONBOARDING_STORE_NAME ).getTaskListsByIds( [
-				'setup_two_column',
-				'extended_two_column',
-			] ),
-			isResolving: select( ONBOARDING_STORE_NAME ).isResolving(
-				'getTaskListsByIds'
-			),
-		};
-	} );
-	const getCurrentTask = () => {
-		if ( ! task ) {
-			return null;
-		}
-
-		const tasks = taskLists.reduce(
-			( acc, taskList ) => [ ...acc, ...taskList.tasks ],
-			[]
-		);
-
-		const currentTask = tasks.find( ( t ) => t.id === task );
-
-		if ( ! currentTask ) {
-			return null;
-		}
-
-		return currentTask;
-	};
-
-	const currentTask = getCurrentTask();
-
-	if ( task && ! currentTask ) {
-		return null;
-	}
-
-	if ( isResolving || ! taskLists[ 0 ] ) {
-		return <TaskListPlaceholder twoColumns={ twoColumns } />;
-	}
-
-	if ( currentTask ) {
-		return (
-			<div className="woocommerce-task-dashboard__container">
-				<Task query={ query } task={ currentTask } />
-			</div>
-		);
-	}
-	// List of task items to be shown on the main task list.
-	// Any other remaining tasks will be moved to the extended task list.
-	const taskList = taskLists[ 0 ];
-	const setupTasks = taskList.tasks;
-
-	const completedTasks = setupTasks.filter(
-		( setupTask ) => setupTask.isComplete
-	);
-	const isTaskListComplete = setupTasks.length === completedTasks.length;
-
-	const dismissedTasks = setupTasks.filter(
-		( setupTask ) => setupTask.isDismissed
-	);
-
-	return (
-		<>
-			{ setupTasks && ( taskList.isVisible || task ) && (
-				<TaskList
-					id={ taskList.id }
-					eventName="tasklist"
-					twoColumns={ twoColumns }
-					keepCompletedTaskList={ taskList.keepCompletedTaskList }
-					dismissedTasks={ dismissedTasks || [] }
-					isComplete={ isTaskListComplete }
-					query={ query }
-					cesHeader={ false }
-					tasks={ setupTasks }
-					title={ __( 'Get ready to start selling', 'woocommerce' ) }
-				/>
-			) }
-		</>
-	);
-};
-
-export default TaskDashboard;
diff --git a/plugins/woocommerce-admin/client/two-column-tasks/task-headers.ts b/plugins/woocommerce-admin/client/two-column-tasks/task-headers.ts
deleted file mode 100644
index 6e4ee244eb7..00000000000
--- a/plugins/woocommerce-admin/client/two-column-tasks/task-headers.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Internal dependencies
- */
-import StoreDetailsHeader from './headers/store-details';
-import TaxHeader from './headers/tax';
-import MarketingHeader from './headers/marketing';
-import AppearanceHeader from './headers/appearance';
-import ShippingHeader from './headers/shipping';
-import ProductsHeader from './headers/products';
-import PurchaseHeader from './headers/purchase';
-import PaymentsHeader from './headers/payments';
-import WoocommercePaymentsHeader from './headers/woocommerce-payments';
-
-const taskHeaders: Record< string, React.ElementType > = {
-	store_details: StoreDetailsHeader,
-	tax: TaxHeader,
-	shipping: ShippingHeader,
-	marketing: MarketingHeader,
-	appearance: AppearanceHeader,
-	payments: PaymentsHeader,
-	products: ProductsHeader,
-	purchase: PurchaseHeader,
-	'woocommerce-payments': WoocommercePaymentsHeader,
-};
-
-export default taskHeaders;
diff --git a/plugins/woocommerce-admin/client/typings/global.d.ts b/plugins/woocommerce-admin/client/typings/global.d.ts
index ef6a9c65c56..9b05bbae8a6 100644
--- a/plugins/woocommerce-admin/client/typings/global.d.ts
+++ b/plugins/woocommerce-admin/client/typings/global.d.ts
@@ -9,7 +9,6 @@ declare global {
 		wcAdminFeatures: {
 			'activity-panels': boolean;
 			analytics: boolean;
-			'product-block-editor': boolean;
 			coupons: boolean;
 			'customer-effort-score-tracks': boolean;
 			homescreen: boolean;
diff --git a/plugins/woocommerce-admin/client/utils/features/features.ts b/plugins/woocommerce-admin/client/utils/features/features.ts
new file mode 100644
index 00000000000..880f6621f81
--- /dev/null
+++ b/plugins/woocommerce-admin/client/utils/features/features.ts
@@ -0,0 +1,40 @@
+/**
+ * Internal dependencies
+ */
+import { getAdminSetting } from '../admin-settings';
+import { Feature } from './types';
+
+const ADMIN_SETTINGS_FEATURES_NAME = 'features';
+
+/**
+ * Get the feature flag from admin settings.
+ *
+ * @param  featureId The feature id
+ * @return The feature flag
+ */
+export function getFeature( featureId: string ): Feature | undefined {
+	const features = getAdminSetting( ADMIN_SETTINGS_FEATURES_NAME );
+	return features && features[ featureId ];
+}
+
+/**
+ * Returns if the feature is enabled.
+ *
+ * @param  featureId The feature id
+ * @return `true` or `false` if the given feature is enabled
+ */
+export function isFeatureEnabled( featureId: string ): boolean {
+	const feature = getFeature( featureId );
+	return Boolean( feature?.is_enabled );
+}
+
+/**
+ * Returns if the feature is experimental.
+ *
+ * @param  featureId The feature id
+ * @return `true` or `false` if the given feature is experimental
+ */
+export function isFeatureExperimental( featureId: string ): boolean {
+	const feature = getFeature( featureId );
+	return Boolean( feature?.is_experimental );
+}
diff --git a/plugins/woocommerce-admin/client/utils/features/index.ts b/plugins/woocommerce-admin/client/utils/features/index.ts
new file mode 100644
index 00000000000..f02e227fb67
--- /dev/null
+++ b/plugins/woocommerce-admin/client/utils/features/index.ts
@@ -0,0 +1,2 @@
+export * from './features';
+export * from './types';
diff --git a/plugins/woocommerce-admin/client/utils/features/types.ts b/plugins/woocommerce-admin/client/utils/features/types.ts
new file mode 100644
index 00000000000..7a7026a7921
--- /dev/null
+++ b/plugins/woocommerce-admin/client/utils/features/types.ts
@@ -0,0 +1,7 @@
+/**
+ * Describe a Feature Flag
+ */
+export interface Feature {
+	is_enabled: boolean;
+	is_experimental: boolean;
+}
diff --git a/plugins/woocommerce-admin/client/wp-admin-scripts/README.md b/plugins/woocommerce-admin/client/wp-admin-scripts/README.md
index eb3ca08feb1..e3fd58aeb88 100644
--- a/plugins/woocommerce-admin/client/wp-admin-scripts/README.md
+++ b/plugins/woocommerce-admin/client/wp-admin-scripts/README.md
@@ -1,5 +1,5 @@
 Scripts located in this directory are meant to be loaded on wp-admin pages outside the context of WooCommerce Admin, such as the post editor. Adding the script name to `wpAdminScripts` in the Webpack config will automatically build these scripts.
 
-Scripts must be manually enqueued with any neccessary dependencies. For example, `onboarding-homepage-notice` uses the WooCommerce navigation package:
+Scripts must be manually enqueued with any necessary dependencies. For example, `onboarding-homepage-notice` uses the WooCommerce navigation package:
 
 `wp_enqueue_script(  'onboarding-homepage-notice', Loader::get_url( 'wp-scripts/onboarding-homepage-notice.js' ), array( 'wc-navigation' ) );`
\ No newline at end of file
diff --git a/plugins/woocommerce-admin/client/wp-admin-scripts/product-tracking/shared.ts b/plugins/woocommerce-admin/client/wp-admin-scripts/product-tracking/shared.ts
index 504ee724cd4..eaab075e38f 100644
--- a/plugins/woocommerce-admin/client/wp-admin-scripts/product-tracking/shared.ts
+++ b/plugins/woocommerce-admin/client/wp-admin-scripts/product-tracking/shared.ts
@@ -412,59 +412,64 @@ const attachProductTagsTracks = () => {
  * Attaches attributes tracks.
  */
 const attachAttributesTracks = () => {
-	function addNewTermEventHandler() {
-		recordEvent( 'product_attributes_add_term', {
-			page: 'product',
-		} );
-	}
-
-	function addNewAttributeTermTracks() {
-		const addNewTermButtons = document.querySelectorAll(
-			'.woocommerce_attribute .add_new_attribute'
-		);
-		addNewTermButtons.forEach( ( button ) => {
-			button.removeEventListener( 'click', addNewTermEventHandler );
-			button.addEventListener( 'click', addNewTermEventHandler );
-		} );
-	}
-	addNewAttributeTermTracks();
+	attachEventListenerToParentForChildren( '#product_attributes', [
+		{
+			eventName: 'click',
+			childQuery: '.add_new_attribute',
+			callback: () => {
+				recordEvent( 'product_attributes_add_term', {
+					page: 'product',
+				} );
+			},
+		},
+	] );
+};
 
+/**
+ * Attaches Tracks event for when a new custom attribute is added to a product.
+ */
+const attachAddCustomAttributeTracks = () => {
 	document
-		.querySelector( '.add_attribute' )
+		.querySelector( '#product_attributes .add_custom_attribute' )
 		?.addEventListener( 'click', () => {
-			setTimeout( () => {
-				addNewAttributeTermTracks();
-			}, 1000 );
+			recordEvent( 'product_attributes_buttons', {
+				action: 'add_new',
+			} );
 		} );
 };
 
+/**
+ * Attaches Tracks event for when an existing global attribute is added to a product.
+ */
+const attachAddExistingAttributeTracks = () => {
+	window
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		// @ts-ignore Need to use jQuery to hook up to the select2:select event since the select2 component is jQuery-based
+		?.jQuery( 'select.wc-attribute-search' )
+		.on( 'select2:select', function () {
+			recordEvent( 'product_attributes_buttons', {
+				action: 'add_existing',
+			} );
+		} );
+};
+
+/**
+ * Gets number of attributes with 'Used for variations' checked.
+ */
+const getUsedForVariationsAttributesCount = () =>
+	( document.querySelector( '#product-type' ) as HTMLSelectElement )
+		?.value === 'variable'
+		? document.querySelectorAll(
+				'input[name^="attribute_variation"]:checked'
+		  ).length
+		: 0;
+
 /**
  * Attaches product attributes tracks.
  */
 const attachProductAttributesTracks = () => {
-	document
-		.querySelector( '#product_attributes .add_custom_attribute' )
-		?.addEventListener( 'click', () => {
-			recordEvent( 'product_attributes_buttons', {
-				action: 'add_first_attribute',
-			} );
-		} );
-	document
-		.querySelector( '#product_attributes .add_attribute' )
-		?.addEventListener( 'click', () => {
-			// We verify that we are not adding an existing attribute to not
-			// duplicate the recorded event.
-			const selectElement = document.querySelector(
-				'.attribute_taxonomy'
-			) as HTMLSelectElement;
-			// Get the index of the selected option
-			const selectedIndex = selectElement.selectedIndex;
-			if ( selectElement.options[ selectedIndex ]?.value === '' ) {
-				recordEvent( 'product_attributes_buttons', {
-					action: 'add_new',
-				} );
-			}
-		} );
+	attachAddCustomAttributeTracks();
+	attachAddExistingAttributeTracks();
 
 	const attributesSection = '#product_attributes';
 
@@ -502,10 +507,6 @@ const attachProductAttributesTracks = () => {
 		},
 	] );
 
-	const attributesCount = document.querySelectorAll(
-		'.woocommerce_attribute'
-	).length;
-
 	document
 		.querySelector( '.save_attributes' )
 		?.addEventListener( 'click', ( event ) => {
@@ -516,37 +517,27 @@ const attachProductAttributesTracks = () => {
 				// skip in case the button is disabled
 				return;
 			}
-			const newAttributesCount = document.querySelectorAll(
-				'.woocommerce_attribute'
+
+			const localAttributesCount = document.querySelectorAll(
+				'.woocommerce_attribute:not(.taxonomy)'
 			).length;
-			if ( newAttributesCount > attributesCount ) {
-				const local_attributes = [
-					...document.querySelectorAll(
-						'.woocommerce_attribute:not(.pa_glbattr)'
-					),
-				].map( ( attr ) => {
-					const terms =
-						(
-							attr.querySelector(
-								"[name^='attribute_values']"
-							) as HTMLTextAreaElement
-						 )?.value.split( '|' ).length ?? 0;
-					return {
-						name: (
-							attr.querySelector(
-								'[name^="attribute_names"]'
-							) as HTMLInputElement
-						 )?.value,
-						terms,
-					};
-				} );
-				recordEvent( 'product_attributes_add', {
-					page: 'product',
-					enable_archive: '',
-					default_sort_order: '',
-					local_attributes,
-				} );
-			}
+
+			const globalAttributesCount = document.querySelectorAll(
+				'.woocommerce_attribute.taxonomy'
+			).length;
+
+			recordEvent( 'product_attributes_save', {
+				page: 'product',
+				total_attributes_count:
+					globalAttributesCount + localAttributesCount,
+				local_attributes_count: localAttributesCount,
+				global_attributes_count: globalAttributesCount,
+				visible_on_product_page_count: document.querySelectorAll(
+					'input[name^="attribute_visibility"]:checked'
+				).length,
+				used_for_variations_count:
+					getUsedForVariationsAttributesCount(),
+			} );
 		} );
 };
 
diff --git a/plugins/woocommerce-admin/docs/examples/extensions/README.md b/plugins/woocommerce-admin/docs/examples/extensions/README.md
index 3141c7c7fd3..26689221298 100644
--- a/plugins/woocommerce-admin/docs/examples/extensions/README.md
+++ b/plugins/woocommerce-admin/docs/examples/extensions/README.md
@@ -12,11 +12,12 @@ pnpm install
 
 Build the example extension by running the pnpm script and passing the example name.
 
+
 ```bash
-WC_EXT=<example> pnpm example --filter=woocommerce/client/admin
+WC_EXT=<example> pnpm --filter=woocommerce/client/admin example
 ```
 
-Include the output plugin in your `.wp-env.json` and `.wp-env.override.json` and restart the WordPress instance. WooCommerce Analytics reports will now reflect the changes made by the example extension.
+You should see a new directory in `./woocommerce/plugins/{example} path.` Include the output plugin in your `.wp-env.json` or `.wp-env.override.json` and restart the WordPress instance. WooCommerce will now reflect the changes made by the example extension.
 
 You can make changes to Javascript and PHP files in the example and see changes reflected upon refresh.
 
@@ -27,3 +28,4 @@ You can make changes to Javascript and PHP files in the example and see changes
 - `dashboard-section` - Adding a custom "section" to the new dashboard area.
 - `table-column` - An example of how to add column(s) to any report.
 - `sql-modification` - An example of how to modify SQL statements.
+- `payment-gateway-suggestions` - An example of how to add a new payment gateway suggestion
diff --git a/plugins/woocommerce-admin/docs/examples/extensions/add-task/class-mytask.php b/plugins/woocommerce-admin/docs/examples/extensions/add-task/class-mytask.php
new file mode 100644
index 00000000000..62555ce82ca
--- /dev/null
+++ b/plugins/woocommerce-admin/docs/examples/extensions/add-task/class-mytask.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Custom task example.
+ *
+ * @package WooCommerce\Admin
+ */
+
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
+
+/**
+ * Custom task class.
+ */
+class MyTask extends Task {
+	/**
+	 * Get the task ID.
+	 *
+	 * @return string
+	 */
+	public function get_id() {
+		return 'my-task';
+	}
+
+	/**
+	 * Title.
+	 *
+	 * @return string
+	 */
+	public function get_title() {
+		return __( 'My task', 'woocommerce' );
+	}
+
+	/**
+	 * Content.
+	 *
+	 * @return string
+	 */
+	public function get_content() {
+		return __( 'Add your task description here for display in the task list.', 'woocommerce' );
+	}
+
+	/**
+	 * Time.
+	 *
+	 * @return string
+	 */
+	public function get_time() {
+		return __( '2 minutes', 'woocommerce' );
+	}
+}
diff --git a/plugins/woocommerce-admin/docs/examples/extensions/add-task/js/index.js b/plugins/woocommerce-admin/docs/examples/extensions/add-task/js/index.js
index 053d3e126e0..258ad61e7b8 100644
--- a/plugins/woocommerce-admin/docs/examples/extensions/add-task/js/index.js
+++ b/plugins/woocommerce-admin/docs/examples/extensions/add-task/js/index.js
@@ -1,13 +1,17 @@
+/* eslint-disable @wordpress/i18n-text-domain */
 /**
  * External dependencies
  */
-
+import { createElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Card, CardBody } from '@wordpress/components';
 import { ONBOARDING_STORE_NAME } from '@woocommerce/data';
 import { registerPlugin } from '@wordpress/plugins';
 import { useDispatch } from '@wordpress/data';
-import { WooOnboardingTask } from '@woocommerce/onboarding';
+import {
+	WooOnboardingTask,
+	WooOnboardingTaskListItem,
+} from '@woocommerce/onboarding';
 
 const Task = ( { onComplete, task } ) => {
 	const { actionTask } = useDispatch( ONBOARDING_STORE_NAME );
@@ -46,10 +50,32 @@ const Task = ( { onComplete, task } ) => {
 registerPlugin( 'add-task-content', {
 	render: () => (
 		<WooOnboardingTask id="my-task">
-			{ ( { onComplete, query, task } ) => (
-				<Task onComplete={ onComplete } task={ task } />
-			) }
+			{ ( {
+				onComplete,
+				// eslint-disable-next-line @typescript-eslint/no-unused-vars
+				query,
+				task,
+			} ) => <Task onComplete={ onComplete } task={ task } /> }
 		</WooOnboardingTask>
 	),
 	scope: 'woocommerce-tasks',
 } );
+
+registerPlugin( 'my-task-list-item-plugin', {
+	scope: 'woocommerce-tasks',
+	render: () => (
+		<WooOnboardingTaskListItem id="my-task">
+			{ ( { defaultTaskItem: DefaultTaskItem } ) => (
+				// Add a custom wrapper around the default task item.
+				<div
+					className="woocommerce-custom-tasklist-item"
+					style={ {
+						border: '1px solid red',
+					} }
+				>
+					<DefaultTaskItem />
+				</div>
+			) }
+		</WooOnboardingTaskListItem>
+	),
+} );
diff --git a/plugins/woocommerce-admin/docs/examples/extensions/add-task/woocommerce-admin-add-task-example.php b/plugins/woocommerce-admin/docs/examples/extensions/add-task/woocommerce-admin-add-task-example.php
index 552ff2a841a..f8ed4e6ace7 100644
--- a/plugins/woocommerce-admin/docs/examples/extensions/add-task/woocommerce-admin-add-task-example.php
+++ b/plugins/woocommerce-admin/docs/examples/extensions/add-task/woocommerce-admin-add-task-example.php
@@ -5,29 +5,18 @@
  * @package WooCommerce\Admin
  */
 
-use Automattic\WooCommerce\Internal\Admin\Onboarding;
-use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
-use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
-
 /**
  * Register the task.
  */
 function add_task_my_task() {
-	TaskLists::add_task(
+	require_once __DIR__ . '/class-mytask.php';
+	$task_lists = \Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists::instance();
+
+	// Add the task to the extended list.
+	$task_lists::add_task(
 		'extended',
-		array(
-			'id'             => 'my-task',
-			'title'          => __( 'My task', 'woocommerce-admin' ),
-			'content'        => __(
-				'Add your task description here for display in the task list.',
-				'woocommerce-admin'
-			),
-			'action_label'   => __( 'Do action', 'woocommerce-admin' ),
-			'is_complete'    => Task::is_task_actioned( 'my-task' ),
-			'can_view'       => 'US' === WC()->countries->get_base_country(),
-			'time'           => __( '2 minutes', 'woocommerce-admin' ),
-			'is_dismissable' => true,
-			'is_snoozeable'  => true,
+		new MyTask(
+			$task_lists::get_list( 'extended' ),
 		)
 	);
 }
diff --git a/plugins/woocommerce-admin/docs/examples/extensions/payment-gateway-suggestions/woocommerce-admin-payment-gateway-suggestions-mock-installer.php b/plugins/woocommerce-admin/docs/examples/extensions/payment-gateway-suggestions/woocommerce-admin-payment-gateway-suggestions-mock-installer.php
index abfe2926fbd..245a3009645 100644
--- a/plugins/woocommerce-admin/docs/examples/extensions/payment-gateway-suggestions/woocommerce-admin-payment-gateway-suggestions-mock-installer.php
+++ b/plugins/woocommerce-admin/docs/examples/extensions/payment-gateway-suggestions/woocommerce-admin-payment-gateway-suggestions-mock-installer.php
@@ -6,7 +6,7 @@
  */
 
 /**
- * This is a workaround to bypass intalling the gateway plugins from WP.org.
+ * This is a workaround to bypass installing the gateway plugins from WP.org.
  * This is not necessary provided your suggestion is a valid WP.org plugin.
  *
  * @param array      $response Response data.
diff --git a/plugins/woocommerce-admin/docs/features/images/task-list.png b/plugins/woocommerce-admin/docs/features/images/task-list.png
new file mode 100644
index 00000000000..858ce486751
Binary files /dev/null and b/plugins/woocommerce-admin/docs/features/images/task-list.png differ
diff --git a/plugins/woocommerce-admin/docs/features/navigation.md b/plugins/woocommerce-admin/docs/features/navigation.md
index 0d56e6bfe5c..bf68adc4d5f 100644
--- a/plugins/woocommerce-admin/docs/features/navigation.md
+++ b/plugins/woocommerce-admin/docs/features/navigation.md
@@ -12,7 +12,7 @@ The fastest way to get started is by creating an example plugin from WooCommerce
 
 `WC_EXT=add-navigation-items pnpm example --filter=woocommerce/client/admin`
 
-This will create a new plugin that covers various features of the navigation and helps to register some intial items and categories within the new navigation menu.  After running the command above, you can make edits directly to the files at `docs/examples/extensions/add-navigation-items` and they will be built and copied to your `wp-content/add-navigation-items` folder on save.
+This will create a new plugin that covers various features of the navigation and helps to register some initial items and categories within the new navigation menu.  After running the command above, you can make edits directly to the files at `docs/examples/extensions/add-navigation-items` and they will be built and copied to your `wp-content/add-navigation-items` folder on save.
 
 If you need to enable the WP Toolbar for debugging purposes in the new navigation, you can add the following filter to do so:
 
diff --git a/plugins/woocommerce-admin/docs/features/onboarding-tasks.md b/plugins/woocommerce-admin/docs/features/onboarding-tasks.md
index c8bdf815de9..76cba59f669 100644
--- a/plugins/woocommerce-admin/docs/features/onboarding-tasks.md
+++ b/plugins/woocommerce-admin/docs/features/onboarding-tasks.md
@@ -4,78 +4,127 @@ The onboarding tasks provides a way to help store owners get their sites quickly
 
 The task list is easily extensible to allow inserting custom tasks around plugin setup that benefits store owners.
 
-### Models and classes
+<img src="./images/task-list.png" width="500px" alt="Onboarding Task List" />
 
-#### TaskLists
+## Adding a custom task
 
-The `TaskLists` class acts as a data store for tasks and provides a way to add or retrieve tasks and lists.
+### Step 1: Add your task in PHP
 
-* `TaskLists::get_lists()` - Get all registered task lists
-* `TaskLists::get_visible()` - Get visible task lists
-* `TaskLists::get_list( $id )` - Get a list by ID
-* `TaskLists::get_task( $id )` - Get a task by ID
-* `TaskLists::add_list( $args )` - Add a list with the given arguments
-* `TaskLists::add_task( $list_id, $args )` - Add a task to a given list ID
-
-#### Task
-
-**Arguments**
+To add a custom task, you first need to create a new class that extends the `Task` class.
 
 ```php
-$args = array(
-  'id'              => 'my-task', // A unique task ID.
-  'title'           => 'My Task', // Task title.
-  'content'         => 'Task explanation and instructions', // Content shown in the task list item.
-  'action_label'    => __( "Do the task!", 'woocommerce' ), // Text used for the action button.
-  'action_url'      => 'http://wordpress.com/my/task', // URL used when clicking the task item in lieu of SlotFill.
-  'is_complete'     => get_option( 'my-task-option', false ), // Determine if the task is complete.
-  'can_view'        => 'US:CA' === wc_get_base_location(),
-  'level'           => 3, // Priority level shown for extended tasks.
-  'time'            => __( '2 minutes', 'plugin-text-domain' ), // Time string for time to complete the task.
-  'is_dismissable'  => false, // Determine if the taks is dismissable.
-  'is_snoozeable'   => true, // Determine if the taks is snoozeable.
-  'additional_info' => array( 'apples', 'oranges', 'bananas' ), // Additional info passed to the task.
-)
-$task = new Task( $args );
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
+
+class MyTask extends Task {
+  public function get_id() {
+    return 'my-task';
+  }
+
+  public function get_title() {
+    return __( 'My task', 'woocommerce' );
+  }
+
+  public function get_content() {
+    return __( 'Add your task description here for display in the task list.', 'woocommerce');
+  }
+
+  public function get_time() {
+    return __( '2 minutes', 'woocommerce' );
+  }
+}
 ```
 
-**Methods**
+You can then add the task to the task list by calling the `add_task` method on the `TaskLists` class.
 
-*   `$task->dismiss()` - Dismiss the task
-*   `$task->undo_dismiss()` - Undo dismissal of a task
-*   `$task->is_dismissed()` - Check if a task is dismissed
-*   `$task->snooze()` - Snooze a task for later
-*   `$task->undo_snooze()` - Undo snoozing of a task
-*   `$task->is_snoozed()` - Check if a task has been snoozed
-*   `$task->mark_actioned()` - Mark a task as actioned.  Optional to help determine completion
-*   `$task->is_actioned()` - Check if a task has been actioned
-*   `$task->get_json()` - Get the camelcase JSON for use in the client
-    * `id` (int) - Task ID.
-    * `title` (string) - Task title.
-    * `canView` (bool) - If a task should be viewable on a given store.
-    * `content` (string) - Task content.
-    * `additionalInfo` (object) - Additional extensible information about the task.
-    * `actionLabel` (string) - The label used for the action button.
-    * `actionUrl` (string) - The URL used when clicking the task if no task card is required.
-    * `isComplete` (bool) - If the task has been completed or not.
-    * `time` (string) - Length of time to complete the task.
-    * `level` (integer) - A priority for task list sorting.
-    * `isActioned` (bool) - If a task has been actioned.
-    * `isDismissed` (bool) - If a task has been dismissed.
-    * `isDismissable` (bool) - Whether or not a task is dismissable.
-    * `isSnoozed` (bool) - If a task has been snoozed.
-    * `isSnoozeable` (bool) - Whether or not a task can be snoozed.
-    * `snoozedUntil` (int) - Timestamp in milliseconds that the task has been snoozed until.
+```php
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
 
-#### TaskList
+TaskLists::add_task(
+  'extended', // The task list ID. See the TaskList section below for more information.
+  new MyTask(
+    $task_lists::get_list( 'extended' ), // The task list object.
+  )
+);
+```
 
-**Arguments**
+### Step 2 – Register the task in JavaScript.
+
+Next, you have to add your task to the tasks list in JavaScript.
+
+```jsx
+import { __ } from '@wordpress/i18n';
+import {
+  WooOnboardingTask,
+  WooOnboardingTaskListItem,
+} from '@woocommerce/onboarding';
+
+const Task = ( { onComplete, task, query } ) => {
+  // Implement your task UI/feature here.
+  return (
+    <div>
+    </div>
+  );
+};
+
+registerPlugin( 'add-task-content', {
+  render: () => (
+    <WooOnboardingTask id="my-task">
+      { ( {
+        onComplete,
+        query,
+        task,
+      } ) => <Task onComplete={ onComplete } task={ task } query={ query } /> }
+    </WooOnboardingTask>
+  )
+```
+
+### Example
+
+You can find a complete example of how to add a custom task as a WordPress plugin in the [examples directory](../examples/extensions/add-task/).
+
+## Models and classes
+
+### TaskLists
+
+The `TaskLists` class serves as a data store for tasks, providing functionality to create, initialize, add tasks, retrieve task lists, and perform other task management operations.
+
+#### Methods
+
+- `TaskLists::instance()`: Returns the class instance of the `TaskLists` interface.
+- `TaskLists::init()`: Initializes the task lists. This method should be called to set up the necessary configurations and hooks for task management.
+- `TaskLists::is_experiment_treatment($name)`: Checks if an experiment is the treatment or control. This is internally used by Woo.
+- `TaskLists::init_default_lists()`: Initializes the default task lists. This method adds predefined task lists with their properties and tasks.
+- `TaskLists::init_tasks()`: Initializes the tasks. This method should be called to initialize the tasks associated with the task lists.
+- `TaskLists::set_active_task()`: Temporarily stores the active task to persist across page loads when necessary. This method is used to manage active tasks.
+- `TaskLists::add_list($args)`: Adds a task list with the specified properties.
+- `TaskLists::add_task($list_id, $args)`: Adds a task to the specified task list.
+- `TaskLists::maybe_add_extended_tasks($extended_tasks)`: Adds default extended task lists.
+- `TaskLists::get_lists()`: Returns an array of all task lists.
+- `TaskLists::get_lists_by_ids($ids)`: Returns an array of task lists filtered by the specified list IDs.
+- `TaskLists::get_list_ids()`: Returns an array of all task list IDs.
+- `TaskLists::clear_lists()`: Clears all task lists.
+- `TaskLists::get_visible()`: Returns an array of visible task lists.
+- `TaskLists::get_list($id)`: Retrieves a task list by its ID.
+- `TaskLists::get_task($id, $task_list_id = null)`: Retrieves a single task.
+- `TaskLists::setup_tasks_remaining()`: Return the number of setup tasks remaining.
+- `TaskLists::menu_task_count()`: Adds a badge to the homescreen menu item for remaining tasks.
+- `TaskLists::task_list_preloaded_settings($settings)`: Adds visible list IDs to component settings.
+
+### TaskList
+
+The `TaskList` class represents a task list. It contains properties and methods for managing task list. We currently have three predefined task lists
+
+- `setup`: The default task list
+- `extended`: The "Things to do next" task list
+- `secret_tasklist`: The "Secret" task list that is used for having tasks that are accessed by other means.
+
+#### Example & Arguments
 
 ```php
 $args = array(
-  'id'      => 'my-list', // A unique task list ID.
-  'title'   => 'My List', // Task list title.
-  'sort_by' => array( // An array of keys to sort the tasks by.
+  'id'                      => 'my-list', // A unique task list ID.
+  'title'                   => 'My List', // Task list title.
+  'sort_by'                 => array( // An array of keys to sort the tasks by.
     array(
       'key'   => 'is_complete',
       'order' => 'asc',
@@ -85,29 +134,138 @@ $args = array(
       'order' => 'asc',
     ),
   ),
-)
-$list = new TaskList( $args );
+  'tasks'                   => array( /* Array of Task objects */ ), // Optional: Initialize with pre-existing tasks.
+  'display_progress_header' => true, // Optional: Whether to display the progress header. 
+  'event_prefix'            => 'tasklist_', // Optional: Event prefix for task-related events.
+  'options'                 => array(
+    'use_completed_title' => true, // Optional: Whether to use a completed title for the task list.
+  ),
+  'visible'                 => true, // Optional: Whether the task list is visible.
+);
+
+$task_list = new TaskList($args);
 ```
 
-**Methods**
+#### Methods
 
-*   `$task_list->is_hidden()` - Check if a task list is hidden
-*   `$task_list->is_visible()` - Check if a task list is visible (opposite value of `is_hidden()`)
-*   `$task_list->hide()` - Hide a task list
-*   `$task_list->unhide()` - Undo hiding of a task list
-*   `$task_list->is_complete()` - Check if a task list is complete
-*   `$task_list->add_task( $args )` - Add a task to a task list
-*   `$task_list->get_viewable_tasks()` - Get tasks that are marked as `can_view` for the store
-*   `$task_list->sort_tasks( $sort_by )` - Sort the tasks by the provided `sort_by` value or the task list `sort_by` property if no argument is passed.
-*   `$task_list->get_json()` - Get the camelcase JSON for use in the client
-    * `id` (int) - Task list ID.
-    * `title` (string) - Task list title.
-    * `isHidden` (bool) - If a task has been hidden.
-    * `isVisible` (bool) - If a task list is visible.
-    * `isComplete` (bool) - Whether or not all viewable tasks have been completed.
-    * `tasks` (array) - An array of `Task` objects.
+- `$task_list::get_list_id()`: Returns the ID of the task list.
+- `$task_list::get_title()`: Returns the title of the task list.
+- `$task_list::get_tasks()`: Returns an array of tasks associated with the task list.
+- `$task_list::add_task($task)`: Adds a task to the task list.
+- `$task_list::remove_task($task_id)`: Removes a task from the task list based on its ID.
+- `$task_list::has_task($task_id)`: Checks if the task list contains a task with the specified ID.
+- `$task_list::get_task($task_id)`: Retrieves a task from the task list based on its ID.
+- `$task_list::get_viewable_tasks()`: Returns an array of viewable tasks within the task list.
+- `$task_list::is_visible()`: Checks if the task list is visible.
+- `$task_list::is_hidden()`: Checks if the task list is hidden.
+- `$task_list::is_complete()`: Checks if all tasks in the task list are complete.
+- `$task_list::get_completed_count()`: Returns the count of completed tasks in the task list.
+- `$task_list::get_total_count()`: Returns the total count of tasks in the task list.
+- `$task_list::get_progress_percentage()`: Returns the progress percentage of the task list.
+- `$task_list::get_sorted_tasks($sort_by)`: Returns the tasks sorted based on the specified sorting criteria.
+- `$task_list::get_json()`: Returns the JSON representation of the task list.
+- `$task_list->get_json()` - Get the camelcase JSON for use in the client
+  - `id` (int) - Task list ID.
+  - `title` (string) - Task list title.
+  - `isHidden` (bool) - If a task has been hidden.
+  - `isVisible` (bool) - If a task list is visible.
+  - `isComplete` (bool) - Whether or not all viewable tasks have been completed.
+  - `tasks` (array) - An array of `Task` objects.
 
-#### Data store actions
+### Task
+
+The `Task` class represents a task. It contains properties and methods for managing tasks. You can see the predefined tasks in [this directory](https://github.com/woocommerce/woocommerce/tree/trunk/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks).
+
+Please note that the `Task` class is abstract and intended to be extended by custom task classes.
+
+#### Example
+
+```php
+<?php
+
+use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Task;
+
+class MyTask extends Task {
+    public function get_id() {
+        // Return a unique identifier for your task
+    }
+
+    public function get_title() {
+        // Return the title of your task
+    }
+
+    public function get_content() {
+        // Return the content/explanation of your task
+    }
+
+    public function get_time() {
+        // Return the estimated time to complete the task
+    }
+    // Implement other abstract methods as needed
+}
+
+// Add MyTask to "test-list" task list
+TaskLists::add_task(
+  'test-list',
+  new MyTask(
+    TaskLists::get_list( 'test-list' )
+  )
+);
+```
+### Methods
+
+- `$task->get_id(): string`: Returns the ID of the task.
+- `$task->get_title(): string`: Returns the title of the task.
+- `$task->get_content(): string`: Returns the content of the task.
+- `$task->get_time(): string`: Returns the estimated time to complete the task.
+- `$task->get_parent_id(): string`: Returns the ID of the parent task list.
+- `$task->get_parent_options(): array`: Returns the options of the parent task list.
+- `$task->get_parent_option($option_name): mixed|null`: Returns the value of a specific option from the parent task list.
+- `$task->prefix_event($event_name): string`: Returns the event name prefixed with the task list's event prefix.
+- `$task->get_additional_info(): string`: Returns additional information about the task. Typically includes details, notes, or instructions related to the task itself.
+- `$task->get_additional_data(): mixed|null`: Returns additional data associated with the task. It can be any type of data, such as arrays, objects, or simple values.
+- `$task->get_action_label(): string`: Returns the label for the action button of the task.
+- `$task->get_action_url(): string|null`: Returns the URL associated with the task's action.
+- `$task->is_dismissable(): bool`: Checks if the task is dismissable.
+- `$task->is_dismissed(): bool`: Checks if the task is dismissed.
+- `$task->dismiss(): bool`: Dismisses the task.
+- `$task->undo_dismiss(): bool`: Undoes the dismissal of the task.
+- `$task->has_previously_completed(): bool`: Checks if the task has been completed in the past.
+- `$task->possibly_track_completion(): void`: Tracks the completion of the task if necessary.
+- `$task->set_active(): void`: Sets the task as the active task.
+- `$task->is_active(): bool`: Checks if the task is the active task.
+- `$task->can_view(): bool`: Checks if the task can be viewed based on store capabilities.
+- `$task->is_complete(): bool`: Checks if the task is complete.
+- `$task->is_visited(): bool`: Checks if the task has been visited.
+- `$task->get_record_view_event(): bool`: Checks if the task view event should be recorded.
+- `$task->convert_object_to_camelcase($data): object`: Converts an array's keys to camel case.
+- `$task->mark_actioned(): bool`: Marks the task as actioned.
+- `$task->is_actioned(): bool`: Checks if the task has been actioned.
+- `$task->is_task_actioned($id): bool`: Checks if a specific task has been actioned.
+- `$task->sort($a, $b, $sort_by): int`: Sorts tasks based on given sort criteria.
+- `$task->get_json(): array`: Returns the task data as a JSON-formatted array.
+  - `id` (int) - Task ID.
+  - `title` (string) - Task title.
+  - `canView` (bool) - If a task should be viewable on a given store.
+  - `content` (string) - Task content.
+  - `additionalInfo` (object) - Additional extensible information about the task.
+  - `actionLabel` (string) - The label used for the action button.
+  - `actionUrl` (string) - The URL used when clicking the task if no task card is required.
+  - `isComplete` (bool) - If the task has been completed or not.
+  - `time` (string) - Length of time to complete the task.
+  - `level` (integer) - A priority for task list sorting.
+  - `isActioned` (bool) - If a task has been actioned.
+  - `isDismissed` (bool) - If a task has been dismissed.
+  - `isDismissable` (bool) - Whether or not a task is dismissable.
+  - `isSnoozed` (bool) - If a task has been snoozed.
+  - `isSnoozeable` (bool) - Whether or not a task can be snoozed.
+  - `snoozedUntil` (int) - Timestamp in milliseconds that the task has been snoozed until.
+
+## Frontend
+
+We use the `@woocommerce/onboarding` package to render the onboarding task lists on the frontend and use the `@woocommerce/data` package to interact with the onboarding store.
+
+### Data store actions
 
 Using the `@woocommerce/data` package, the following selectors and actions are available to interact with the task lists under the onboarding store.
 
@@ -125,64 +283,63 @@ const { taskLists } = useSelect( ( select ) => {
 } );
 ```
 
+- `getTaskLists` - (select) Resolve any registered task lists with their nested tasks
+- `hideTaskList( id )` - (dispatch) Hide a task list
+- `actionTask( id )` - (dispatch) Mark a task as actioned
+- `dismissTask( id )` - (dispatch) Dismiss a task
+- `undoDismissTask( id )` - (dispatch) Undo task dismiss
+- `optimisticallyCompleteTask( id )` - (dispatch) Optimistically mark a task as complete
 
-* `getTaskLists` - (select) Resolve any registered task lists with their nested tasks
-* `hideTaskList( id )` - (dispatch) Hide a task list
-* `actionTask( id )` - (dispatch) Mark a task as actioned
-* `snoozeTask( id )` - (dispatch) Snooze a task
-* `dismissTask( id )` - (dispatch) Dismiss a task
-* `optimisticallyCompleteTask( id )` - (dispatch) Optimistically mark a task as complete
+### API Endpoints
 
+The following REST endpoints are available to interact with tasks. For ease of use, we recommend using the data store actions above to interact with these endpoints.
+
+- `/wc-admin/onboarding/tasks` (GET) - Retrieve all tasks and their statuses
+- `/wc-admin/onboarding/tasks/{list_id}/hide` (POST) - Hide a given task list
+- `/wc-admin/onboarding/tasks/{task_id}/unhide` (POST) - Un-hide a given task list
+- `/wc-admin/onboarding/tasks/{task_id}/dismiss` (POST) - Dismiss a task
+- `/wc-admin/onboarding/tasks/{task_id}/undo_dismiss` (POST) - Undo dismissal of a task
+- `/wc-admin/onboarding/tasks/{task_id}/action` (POST) - Mark a task as actioned
 
 ### SlotFills
 
-The task UI can be supplemented by registering plugins that fill the provided task slots.
+The task UI can be supplemented by registering plugins that fill the provided task slots. Learn more about slot fills in the [SlotFill documentation](https://developer.wordpress.org/block-editor/reference-guides/slotfills/) and [here](https://developer.wordpress.org/block-editor/reference-guides/components/slot-fill/).
 
-#### Task content
+### Task content
 
-A task list fill is required if no `action_url` is provided for the task.  This is the content shown after a task list item has been clicked.
+A task list fill is required if no `action_url` is provided for the task. This is the content shown after a task list item has been clicked.
 
 ```js
+import { registerPlugin } from '@wordpress/plugins';
 import { WooOnboardingTask } from '@woocommerce/onboarding';
 
 registerPlugin( 'my-task-plugin', {
-	scope: 'woocommerce-tasks',
-	render: () => (
+  scope: 'woocommerce-tasks',
+  render: () => (
     <WooOnboardingTask id="my-task">
-      { ( { onComplete, query } ) => (
-        <MyTask onComplete={ onComplete } />
+      { ( { onComplete, query, task } ) => (
+        <MyTask onComplete={ onComplete } query={ query } task={ task } />
       ) }
     </WooOnboardingTask>
-	),
+  ),
 } );
 ```
-#### Task list item
 
-The items shown in the list can be customized beyond the default task list item.  This can allow for custom appearance or specific `onClick` behavior for your task.
+### Task list item
+
+The items shown in the list can be customized beyond the default task list item. This can allow for custom appearance or specific `onClick` behavior for your task. For example, we're using this to install and activate WooCommerce Payments when clicking on the WooCommerce Payment task
 
 ```js
 import { WooOnboardingTaskListItem } from '@woocommerce/onboarding';
 
 registerPlugin( 'my-task-list-item-plugin', {
-	scope: 'woocommerce-tasks',
-	render: () => (
+  scope: 'woocommerce-tasks',
+  render: () => (
     <WooOnboardingTaskListItem id="appearance">
       { ( { defaultTaskItem, onComplete } ) => (
         <MyTaskListItem onComplete={ onComplete } />
       ) }
     </WooOnboardingTaskListItem>
-	),
+  ),
 } );
 ```
-
-### Endpoints
-
-The following REST endpoints are available to interact with tasks.  For ease of use, we recommend using the data store actions above to interact with these endpoints.
-
-*   `/wc-admin/onboarding/tasks` (GET) - Retrieve all tasks and their statuses
-*   `/wc-admin/onboarding/tasks/{list_id}/hide` (POST) - Hide a given task list
-*   `/wc-admin/onboarding/tasks/{task_id}/dismiss` (POST) - Dismiss a task
-*   `/wc-admin/onboarding/tasks/{task_id}/undo_dismiss` (POST) - Undo dismissal of a task
-*   `/wc-admin/onboarding/tasks/{task_id}/snooze` (POST) - Snooze a task for later
-*   `/wc-admin/onboarding/tasks/{task_id}/undo_snooze` (POST) - Undo snoozing of a task
-*   `/wc-admin/onboarding/tasks/{task_id}/action` (POST) - Mark a task as actioned
\ No newline at end of file
diff --git a/plugins/woocommerce-admin/docs/features/onboarding.md b/plugins/woocommerce-admin/docs/features/onboarding.md
index 4328d8aaf74..c2ae884fa93 100644
--- a/plugins/woocommerce-admin/docs/features/onboarding.md
+++ b/plugins/woocommerce-admin/docs/features/onboarding.md
@@ -70,7 +70,7 @@ To disconnect from WooCommerce.com, go to `WooCommerce > Extensions > WooCommerc
 
 ## Jetpack Connection
 
-Using Jetpack & WooCommerce Shipping & Tax allows us to offer additional features to new WooCommerce users as well as simplify parts of the setup process. For example, we can do automated tax calculations for certain countries, significantly simplifying the tax task. To make this work, the user needs to be connected to a WordPress.com account. This also means development and testing of these features needs to be done on a Jetpack connected site. Search the MGS & the Feld  Guide for additional resources on testing Jetpack with local setups.
+Using Jetpack & WooCommerce Shipping & Tax allows us to offer additional features to new WooCommerce users as well as simplify parts of the setup process. For example, we can do automated tax calculations for certain countries, significantly simplifying the tax task. To make this work, the user needs to be connected to a WordPress.com account. This also means development and testing of these features needs to be done on a Jetpack connected site. Search the MGS & the Field Guide for additional resources on testing Jetpack with local setups.
 
 We have a special Jetpack connection flow designed specifically for WooCommerce onboarding, so that the user feels that they are connecting as part of a cohesive experience. To access this flow, we have a custom Jetpack connection endpoint [/wc-admin/plugins/connect-jetpack](https://github.com/woocommerce/woocommerce/blob/feba6a8dcd55d4f5c7edc05478369c76df082293/plugins/woocommerce/src/Admin/API/Plugins.php#L395-L417).
 
diff --git a/plugins/woocommerce-admin/docs/features/payment-gateway-suggestions.md b/plugins/woocommerce-admin/docs/features/payment-gateway-suggestions.md
index d65ce68127b..b8ea6752f42 100644
--- a/plugins/woocommerce-admin/docs/features/payment-gateway-suggestions.md
+++ b/plugins/woocommerce-admin/docs/features/payment-gateway-suggestions.md
@@ -6,7 +6,7 @@ After merchants click on a recommendation, plugins from this source will then wa
 
 ### Quick start
 
-Gateway suggestions are retreived from a REST API and can be added via a remote JSON data source or filtered with the `woocommerce_admin_payment_gateway_suggestion_specs` filter.
+Gateway suggestions are retrieved from a REST API and can be added via a remote JSON data source or filtered with the `woocommerce_admin_payment_gateway_suggestion_specs` filter.
 
 To quickly get started with an example plugin, run the following:
 
@@ -22,7 +22,7 @@ If a user is not opted into marketplace suggestions or polling fails, the gatewa
 
 ## Remote Data Source Schema
 
-The data source schema defines the recommended payment gateways and required plugins to kick of the setup process. The goal of this config is to provide the mininum amount of information possible to show a list of gateways and allow the gateways themselves to define specifics around configuration.
+The data source schema defines the recommended payment gateways and required plugins to kick of the setup process. The goal of this config is to provide the minimum amount of information possible to show a list of gateways and allow the gateways themselves to define specifics around configuration.
 
 ```json
 [
diff --git a/plugins/woocommerce-admin/docs/woocommerce.com/README.md b/plugins/woocommerce-admin/docs/woocommerce.com/README.md
index 2ed099f6070..06a17b6f40b 100644
--- a/plugins/woocommerce-admin/docs/woocommerce.com/README.md
+++ b/plugins/woocommerce-admin/docs/woocommerce.com/README.md
@@ -10,7 +10,7 @@ Currently, development efforts have been focused on two primary areas:
 
 ## Analytics
 
-With WooCommerce installed, a new Analytics menu item is created in the wp-admin menu system. This menu item, and the reports contained insde of it are available to all wp-admin users that have the `view_woocommerce_reports` capability, so per a standard WooCommerce install this would give `shop_manager`s and `administrator`s access to the reports.
+With WooCommerce installed, a new Analytics menu item is created in the wp-admin menu system. This menu item, and the reports contained inside of it are available to all wp-admin users that have the `view_woocommerce_reports` capability, so per a standard WooCommerce install this would give `shop_manager`s and `administrator`s access to the reports.
 
 Each report is quite unique with its own set of filtering options and chart types. To learn more about each individual report, please view the pages below:
 
diff --git a/plugins/woocommerce-admin/docs/woocommerce.com/activity-panels.md b/plugins/woocommerce-admin/docs/woocommerce.com/activity-panels.md
index 0b68f783f1a..58f83536679 100644
--- a/plugins/woocommerce-admin/docs/woocommerce.com/activity-panels.md
+++ b/plugins/woocommerce-admin/docs/woocommerce.com/activity-panels.md
@@ -2,7 +2,7 @@
 
 The Activity Panel aims to be a "one stop shop" for managing your store - fulfill new orders, manage product inventory, moderate reviews, and get information about running your store.
 
-Activity Panels can be accessed wherever the WooCommerce Admin nagivation bar is shown.
+Activity Panels can be accessed wherever the WooCommerce Admin navigation bar is shown.
 
 ![Activity Panels Tabs Overview](images/activity-panels-tabs.png)
 
diff --git a/plugins/woocommerce-admin/docs/woocommerce.com/analytics-basics.md b/plugins/woocommerce-admin/docs/woocommerce.com/analytics-basics.md
index f846c5f7e28..1cb3b7e38f8 100644
--- a/plugins/woocommerce-admin/docs/woocommerce.com/analytics-basics.md
+++ b/plugins/woocommerce-admin/docs/woocommerce.com/analytics-basics.md
@@ -46,7 +46,7 @@ The _Summary Number_ tab gives you a quick view at the total figure for that met
 ### Chart
 ![Analytics Chart](analytics-basics-chart.png)
 
-The charts on report pages offer quite a few options to customize the visualiztion of data. The data legend ( labeled A ) allows you to toggle the visiblity of the different data set periods. The _Interval Selector_ ( labeled B ) allows you to adjust the interval displayed in the chart. The options available here are dependent upon the length of the date range selected:
+The charts on report pages offer quite a few options to customize the visualiztion of data. The data legend ( labeled A ) allows you to toggle the visibility of the different data set periods. The _Interval Selector_ ( labeled B ) allows you to adjust the interval displayed in the chart. The options available here are dependent upon the length of the date range selected:
 
 | Length of Date Range  | Interval Options  |
 |---|---|
@@ -69,10 +69,10 @@ The table which displays the detailed data on Analytics reports also has a numbe
 
 Many columns in reports will allow you to click on the column header to sort the tabular data by that value, and to either sort by that value in ascending or descending order. Simply click the column header to sort by that value, and click it again to change between ascending and descending sort.
 
-### Toggle Column Visiblity
+### Toggle Column Visibility
 ![Analytics Table Column Sorting](analytics-table-column-visbility.png)
 
-If a report contains a data column that you don't need to be displayed, you can adjust the visiblity of it by using the visibility menu on the right side of the table header. Click the column name in the menu to change the visibility of the column. Your visibility selections are persisted to your user preferences for each report, so on subsequent visits to that report, the columns you have previously toggled off will not be displayed.
+If a report contains a data column that you don't need to be displayed, you can adjust the visibility of it by using the visibility menu on the right side of the table header. Click the column name in the menu to change the visibility of the column. Your visibility selections are persisted to your user preferences for each report, so on subsequent visits to that report, the columns you have previously toggled off will not be displayed.
 
 ### CSV Download
 ![Analytics Table csv Download](analytics-table-download-button.png)
@@ -89,4 +89,4 @@ If your selected date range results in a data set that spans more then one page
 When the data displayed in the table is larger than the default single page size of 25, some pagination options will appear in the table footer area. Directional buttons, labeled `<` and `>` enable you to move backwards and forwards between pages, and a text field will allow you to jump to a specific page number. Furthermore you can change the number of rows to display per page.
 
 ### Table Search Box
-On some reports, a search box is displayed in the table header area as well. For details on what the search box does on a given report, please refer to the associated documentaiton page for that report.
\ No newline at end of file
+On some reports, a search box is displayed in the table header area as well. For details on what the search box does on a given report, please refer to the associated documentation page for that report.
\ No newline at end of file
diff --git a/plugins/woocommerce-admin/docs/woocommerce.com/analytics-settings.md b/plugins/woocommerce-admin/docs/woocommerce.com/analytics-settings.md
index 007c226f256..90df3b1f78b 100644
--- a/plugins/woocommerce-admin/docs/woocommerce.com/analytics-settings.md
+++ b/plugins/woocommerce-admin/docs/woocommerce.com/analytics-settings.md
@@ -12,7 +12,7 @@ WooCommerce Admin is pre-configured with default settings for WooCommerce Analyt
 
 ![Excluded statuses settings](images/settings-excluded-statuses.png)
 
-In this section, statuses that are **unchecked** are **included** in anayltics reports. **Checked** statuses are **excluded**. If your store uses custom order statuses, those statuses are included in the reports by default. They will be listed in this section under `Custom Statuses` and can be excluded via the status checkbox.
+In this section, statuses that are **unchecked** are **included** in analytics reports. **Checked** statuses are **excluded**. If your store uses custom order statuses, those statuses are included in the reports by default. They will be listed in this section under `Custom Statuses` and can be excluded via the status checkbox.
 
 ### Default Date Range
 
diff --git a/plugins/woocommerce-admin/package.json b/plugins/woocommerce-admin/package.json
index e6b060a3535..66556e9b9f8 100644
--- a/plugins/woocommerce-admin/package.json
+++ b/plugins/woocommerce-admin/package.json
@@ -92,7 +92,6 @@
 		"history": "^5.3.0",
 		"lodash": "^4.17.21",
 		"memize": "^1.1.0",
-		"qs": "^6.10.3",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-router-dom": "^6.3.0",
@@ -172,6 +171,7 @@
 		"@wordpress/scripts": "^12.6.1",
 		"@wordpress/stylelint-config": "^20.0.2",
 		"@xstate/inspect": "0.8.0",
+		"@xstate/test": "0.5.1",
 		"autoprefixer": "^10.4.2",
 		"await-exec": "^0.1.2",
 		"babel-jest": "^27.5.1",
diff --git a/plugins/woocommerce-admin/webpack.config.js b/plugins/woocommerce-admin/webpack.config.js
index 6252874b4d9..e66e67f9477 100644
--- a/plugins/woocommerce-admin/webpack.config.js
+++ b/plugins/woocommerce-admin/webpack.config.js
@@ -205,15 +205,6 @@ const webpackConfig = {
 			],
 		} ),
 
-		new CopyWebpackPlugin( {
-			patterns: [
-				{
-					from: '../../packages/js/product-editor/assets',
-					to: './product-editor',
-				},
-			],
-		} ),
-
 		// React Fast Refresh.
 		! isProduction && isHot && new ReactRefreshWebpackPlugin(),
 
diff --git a/plugins/woocommerce-beta-tester/changelog/add-example-slotfills b/plugins/woocommerce-beta-tester/changelog/add-example-slotfills
new file mode 100644
index 00000000000..1b8154383fc
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/changelog/add-example-slotfills
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add SlotFill Examples feature
diff --git a/plugins/woocommerce-beta-tester/changelog/fix-37502 b/plugins/woocommerce-beta-tester/changelog/fix-37502
new file mode 100644
index 00000000000..115429c4b01
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/changelog/fix-37502
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Correct spelling errors
diff --git a/plugins/woocommerce-beta-tester/changelog/fix-reload-when-toggle b/plugins/woocommerce-beta-tester/changelog/fix-reload-when-toggle
new file mode 100644
index 00000000000..e8e69293be0
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/changelog/fix-reload-when-toggle
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Reload page when toggling new-product-management-experience and product-block-editor
diff --git a/plugins/woocommerce-beta-tester/changelog/update-beta_tester_feature_compatibility b/plugins/woocommerce-beta-tester/changelog/update-beta_tester_feature_compatibility
new file mode 100644
index 00000000000..96d810870a0
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/changelog/update-beta_tester_feature_compatibility
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Declare compatibility for custom order table and product block editor features.
diff --git a/plugins/woocommerce-beta-tester/changelog/update-wp-env-7.0.0 b/plugins/woocommerce-beta-tester/changelog/update-wp-env-7.0.0
new file mode 100644
index 00000000000..f7dace12d1d
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/changelog/update-wp-env-7.0.0
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Dev-only change
+
+
diff --git a/plugins/woocommerce-beta-tester/package.json b/plugins/woocommerce-beta-tester/package.json
index 695b9ff8509..16d70aad0e2 100644
--- a/plugins/woocommerce-beta-tester/package.json
+++ b/plugins/woocommerce-beta-tester/package.json
@@ -15,7 +15,7 @@
 		"@types/wordpress__components": "^19.10.3",
 		"@woocommerce/dependency-extraction-webpack-plugin": "workspace:*",
 		"@woocommerce/eslint-plugin": "workspace:*",
-		"@wordpress/env": "^4.8.0",
+		"@wordpress/env": "^7.0.0",
 		"@wordpress/prettier-config": "^2.5.0",
 		"@wordpress/scripts": "^19.2.4",
 		"eslint": "^8.32.0",
diff --git a/plugins/woocommerce-beta-tester/plugin.php b/plugins/woocommerce-beta-tester/plugin.php
index 0d01e8f77d8..810c1bfb1cd 100644
--- a/plugins/woocommerce-beta-tester/plugin.php
+++ b/plugins/woocommerce-beta-tester/plugin.php
@@ -16,6 +16,7 @@ add_action( 'wp_loaded', function() {
 } );
 
 add_filter( 'woocommerce_admin_get_feature_config', function( $feature_config ) {
+	$feature_config['beta-tester-slotfill-examples'] = false;
     $custom_feature_values = get_option( 'wc_admin_helper_feature_values', array() );
     foreach ( $custom_feature_values as $feature => $value ) {
         if ( isset(  $feature_config[$feature] ) ) {
diff --git a/plugins/woocommerce-beta-tester/src/example-fills/experimental-woocommerce-wcpay-feature.js b/plugins/woocommerce-beta-tester/src/example-fills/experimental-woocommerce-wcpay-feature.js
new file mode 100644
index 00000000000..369a4a5101f
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/src/example-fills/experimental-woocommerce-wcpay-feature.js
@@ -0,0 +1,27 @@
+/**
+ * External dependencies
+ */
+import { registerPlugin } from '@wordpress/plugins';
+import { Fill } from '@wordpress/components';
+
+const MyFill = () => (
+	<Fill name="experimental_woocommerce_wcpay_feature">
+		<div className="woocommerce-experiments-placeholder-slotfill">
+			<div className="placeholder-slotfill-content">
+				Slotfill goes in here!
+			</div>
+		</div>
+	</Fill>
+);
+
+if ( window.wcAdminFeatures && window.wcAdminFeatures[ 'beta-tester-slotfill-examples' ] ) {
+	registerPlugin(
+		'beta-tester-woocommerce-experiments-placeholder-slotfill-example',
+		{
+			render: MyFill,
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+			// @ts-ignore
+			scope: 'woocommerce-admin',
+		}
+	);
+}
diff --git a/plugins/woocommerce-beta-tester/src/features/index.js b/plugins/woocommerce-beta-tester/src/features/index.js
index 667f817de85..6f938ae850f 100644
--- a/plugins/woocommerce-beta-tester/src/features/index.js
+++ b/plugins/woocommerce-beta-tester/src/features/index.js
@@ -23,6 +23,15 @@ function Features() {
 
 	const sortedFeatureNames = Object.keys( features ).sort();
 
+	const afterToggleCallback = {
+		'new-product-management-experience': () => {
+			window.location.reload();
+		},
+		'product-block-editor': () => {
+			window.location.reload();
+		},
+	};
+
 	return (
 		<div id="wc-admin-test-helper-features">
 			<h2>
@@ -43,8 +52,9 @@ function Features() {
 							<ToggleControl
 								label={ feature_name }
 								checked={ features[ feature_name ] }
-								onChange={ () => {
-									toggleFeature( feature_name );
+								onChange={ async () => {
+									await toggleFeature( feature_name );
+									afterToggleCallback[ feature_name ]?.();
 								} }
 							/>
 						</li>
diff --git a/plugins/woocommerce-beta-tester/src/index.js b/plugins/woocommerce-beta-tester/src/index.js
index 503716ad4fc..0a5f2adc922 100644
--- a/plugins/woocommerce-beta-tester/src/index.js
+++ b/plugins/woocommerce-beta-tester/src/index.js
@@ -8,6 +8,7 @@ import { render } from '@wordpress/element';
  */
 import { App } from './app';
 import './index.scss';
+import './example-fills/experimental-woocommerce-wcpay-feature';
 
 const appRoot = document.getElementById(
 	'woocommerce-admin-test-helper-app-root'
diff --git a/plugins/woocommerce-beta-tester/woocommerce-beta-tester.php b/plugins/woocommerce-beta-tester/woocommerce-beta-tester.php
index 413d573e352..d6cd3fc72f2 100644
--- a/plugins/woocommerce-beta-tester/woocommerce-beta-tester.php
+++ b/plugins/woocommerce-beta-tester/woocommerce-beta-tester.php
@@ -44,7 +44,7 @@ function _wc_beta_tester_load_textdomain() {
 add_action( 'plugins_loaded', '_wc_beta_tester_load_textdomain' );
 
 /**
- * Boostrap plugin.
+ * Bootstrap plugin.
  */
 function _wc_beta_tester_bootstrap() {
 
@@ -88,6 +88,8 @@ function add_extension_register_script() {
 		);
 	$script_url        = plugins_url( $script_path, __FILE__ );
 
+	$script_asset['dependencies'][] = WC_ADMIN_APP; // Add WCA as a dependency to ensure it loads first.
+
 	wp_register_script(
 		'woocommerce-admin-test-helper',
 		$script_url,
@@ -120,3 +122,13 @@ function add_extension_register_script() {
 }
 
 add_action( 'admin_enqueue_scripts', 'add_extension_register_script' );
+
+add_action(
+	'before_woocommerce_init',
+	function() {
+		if ( class_exists( '\Automattic\WooCommerce\Utilities\FeaturesUtil' ) ) {
+			\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+			\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'product_block_editor', __FILE__, true );
+		}
+	}
+);
diff --git a/plugins/woocommerce/.wp-env.json b/plugins/woocommerce/.wp-env.json
index 618c4a21fdf..a4f79b86e22 100644
--- a/plugins/woocommerce/.wp-env.json
+++ b/plugins/woocommerce/.wp-env.json
@@ -10,13 +10,24 @@
         "ALTERNATE_WP_CRON": true
     },
     "mappings": {
-        "wp-cli.yml": ".\/tests\/wp-cli.yml"
+        "wp-cli.yml": "./tests/wp-cli.yml"
     },
+    "afterSetup": "./tests/e2e-pw/bin/test-env-setup.sh",
     "env": {
-        "development": [],
+        "development": {},
         "tests": {
             "port": 8086,
+            "plugins": [
+                ".",
+                "https://downloads.wordpress.org/plugin/akismet.zip",
+                "https://github.com/WP-API/Basic-Auth/archive/master.zip",
+                "https://downloads.wordpress.org/plugin/wp-mail-logging.zip"
+            ],
+            "themes": [
+                "https://downloads.wordpress.org/theme/twentynineteen.zip"
+            ],
             "config": {
+                "WP_TESTS_DOMAIN": "localhost",
                 "ALTERNATE_WP_CRON": false
             }
         }
diff --git a/plugins/woocommerce/assets/images/onboarding/jetpack.svg b/plugins/woocommerce/assets/images/onboarding/jetpack.svg
new file mode 100644
index 00000000000..705bbd0e449
--- /dev/null
+++ b/plugins/woocommerce/assets/images/onboarding/jetpack.svg
@@ -0,0 +1,3 @@
+<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.9767 0.75C6.23333 0.75 0.75 6.23333 0.75 12.9767C0.75 19.72 6.23333 25.2033 12.9767 25.2033C19.72 25.2033 25.2033 19.72 25.2033 12.9767C25.2033 6.23333 19.72 0.75 12.9767 0.75ZM12.3467 15.0067H6.25667L12.3467 3.15333V15.0067ZM13.5833 22.7767V10.9233H19.6733L13.5833 22.7767Z" fill="#069E08"/>
+</svg>
diff --git a/plugins/woocommerce/assets/images/onboarding/woo.svg b/plugins/woocommerce/assets/images/onboarding/woo.svg
new file mode 100644
index 00000000000..aa0897def11
--- /dev/null
+++ b/plugins/woocommerce/assets/images/onboarding/woo.svg
@@ -0,0 +1,26 @@
+<svg
+	width="100"
+	height="64"
+	viewBox="-10 0 120 64"
+	fill="none"
+	xmlns="http://www.w3.org/2000/svg"
+>
+	<path
+		fill-rule="evenodd"
+		clip-rule="evenodd"
+		d="M9.78073 0.5H91.1787C96.3299 0.5 100.5 4.77335 100.5 10.0522V41.8929C100.5 47.1717 96.3299 51.4451 91.1787 51.4451H61.9883L65.9948 61.5L48.3742 51.4451H9.82161C4.67036 51.4451 0.500298 47.1717 0.500298 41.8929V10.0522C0.459415 4.81524 4.62947 0.5 9.78073 0.5Z"
+		fill="#7F54B3"
+	/>
+	<path
+		d="M5.48791 9.1725C6.06028 8.37648 6.91882 7.95752 8.06354 7.87373C10.1486 7.70615 11.3342 8.71165 11.6204 10.8902C12.8877 19.6464 14.2778 27.0619 15.7495 33.1368L24.7029 15.6663C25.5206 14.0743 26.5426 13.2364 27.7691 13.1526C29.568 13.0269 30.6718 14.2 31.1215 16.6718C32.1436 22.2439 33.4519 26.9781 35.0054 31.0001C36.0684 20.3586 37.8672 12.6917 40.402 7.95753C41.0152 6.78445 41.9146 6.19791 43.1002 6.11412C44.0405 6.03033 44.8991 6.3236 45.6759 6.95203C46.4526 7.58047 46.8615 8.37648 46.9432 9.34008C46.9841 10.0942 46.8615 10.7226 46.5344 11.3511C44.94 14.3676 43.6317 19.4369 42.5688 26.4754C41.5467 33.3044 41.1787 38.6251 41.424 42.4376C41.5058 43.485 41.3423 44.4067 40.9334 45.2027C40.4428 46.1244 39.707 46.6272 38.7666 46.711C37.7037 46.7948 36.5998 46.292 35.5369 45.1608C31.7348 41.1807 28.7094 35.2316 26.5018 27.3133C23.8444 32.6759 21.882 36.6979 20.6146 39.3792C18.2025 44.1134 16.1584 46.5434 14.4413 46.6691C13.3374 46.7529 12.3971 45.7893 11.5795 43.7783C9.49445 38.2899 7.24589 27.6904 4.83379 11.9795C4.71114 10.8902 4.91555 9.92662 5.48791 9.1725Z"
+		fill="white"
+	/>
+	<path
+		d="M93.3864 15.7499C91.9146 13.1105 89.7478 11.5185 86.8451 10.89C86.0683 10.7225 85.3324 10.6387 84.6374 10.6387C80.7127 10.6387 77.5238 12.7335 75.0299 16.923C72.904 20.4841 71.8411 24.4223 71.8411 28.7376C71.8411 31.9635 72.4952 34.7286 73.8034 37.0329C75.2752 39.6723 77.442 41.2644 80.3447 41.8928C81.1215 42.0604 81.8574 42.1442 82.5524 42.1442C86.518 42.1442 89.7069 40.0494 92.1599 35.8598C94.2858 32.2568 95.3488 28.3186 95.3488 24.0034C95.3488 20.7355 94.6946 18.0123 93.3864 15.7499ZM88.2351 27.355C87.6628 30.1201 86.6407 32.173 85.128 33.5556C83.9424 34.6449 82.8386 35.1057 81.8165 34.8962C80.8353 34.6868 80.0177 33.8069 79.4044 32.173C78.9138 30.8742 78.6685 29.5755 78.6685 28.3605C78.6685 27.3131 78.7503 26.2657 78.9547 25.3021C79.3226 23.5844 80.0177 21.9086 81.1215 20.3166C82.4706 18.2637 83.9015 17.4258 85.3733 17.719C86.3545 17.9285 87.1722 18.8083 87.7854 20.4422C88.276 21.741 88.5213 23.0398 88.5213 24.2547C88.5213 25.344 88.3987 26.3914 88.2351 27.355Z"
+		fill="white"
+	/>
+	<path
+		d="M67.7528 15.7499C66.281 13.1105 64.0734 11.5185 61.2116 10.89C60.4348 10.7225 59.6989 10.6387 59.0039 10.6387C55.0791 10.6387 51.8903 12.7335 49.3964 16.923C47.2705 20.4841 46.2075 24.4223 46.2075 28.7376C46.2075 31.9635 46.8616 34.7286 48.1699 37.0329C49.6417 39.6723 51.8085 41.2644 54.7112 41.8928C55.488 42.0604 56.2238 42.1442 56.9189 42.1442C60.8845 42.1442 64.0734 40.0494 66.5263 35.8598C68.6523 32.2568 69.7152 28.3186 69.7152 24.0034C69.7152 20.7355 69.0611 18.0123 67.7528 15.7499ZM62.6016 27.355C62.0292 30.1201 61.0071 32.173 59.4945 33.5556C58.3089 34.6449 57.205 35.1057 56.183 34.8962C55.2018 34.6868 54.3841 33.8069 53.7709 32.173C53.2803 30.8742 53.035 29.5755 53.035 28.3605C53.035 27.3131 53.1167 26.2657 53.3212 25.3021C53.6891 23.5844 54.3841 21.9086 55.4879 20.3166C56.8371 18.2637 58.268 17.4258 59.7398 17.719C60.721 17.9285 61.5386 18.8083 62.1519 20.4422C62.6425 21.741 62.8878 23.0398 62.8878 24.2547C62.8878 25.344 62.806 26.3914 62.6016 27.355Z"
+		fill="white"
+	/>
+</svg>
diff --git a/plugins/woocommerce/assets/images/payfast.png b/plugins/woocommerce/assets/images/payfast.png
index 7199cd00b8f..2b519640340 100644
Binary files a/plugins/woocommerce/assets/images/payfast.png and b/plugins/woocommerce/assets/images/payfast.png differ
diff --git a/plugins/woocommerce/assets/images/payment_methods/72x72/payfast.png b/plugins/woocommerce/assets/images/payment_methods/72x72/payfast.png
index 96440121c30..40d30bfeaaa 100644
Binary files a/plugins/woocommerce/assets/images/payment_methods/72x72/payfast.png and b/plugins/woocommerce/assets/images/payment_methods/72x72/payfast.png differ
diff --git a/plugins/woocommerce/bin/lint-branch.sh b/plugins/woocommerce/bin/lint-branch.sh
new file mode 100644
index 00000000000..ed17883fe5c
--- /dev/null
+++ b/plugins/woocommerce/bin/lint-branch.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Lint branch
+#
+# Runs phpcs-changed, comparing the current branch to its "base" or "parent" branch.
+# The base branch defaults to trunk, but another branch name can be specified as an
+# optional positional argument.
+#
+# Example:
+# ./lint-branch.sh base-branch
+
+baseBranch=${1:-"trunk"}
+
+changedFiles=$(git diff $(git merge-base HEAD $baseBranch) --relative --name-only -- '*.php')
+
+# Only complete this if changed files are detected.
+[[ -z $changedFiles ]] || composer exec phpcs-changed -- -s --git --git-base $baseBranch $changedFiles
diff --git a/plugins/woocommerce/changelog/2023-04-20-20-32-58-372082 b/plugins/woocommerce/changelog/2023-04-20-20-32-58-372082
deleted file mode 100644
index 0cf26c7f83d..00000000000
--- a/plugins/woocommerce/changelog/2023-04-20-20-32-58-372082
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Handle updating customer when user_registered is 0000-00-00 00:00:00.
diff --git a/plugins/woocommerce/changelog/2023-05-02-09-36-02-782439 b/plugins/woocommerce/changelog/2023-05-02-09-36-02-782439
new file mode 100644
index 00000000000..2d86c3ccd8b
--- /dev/null
+++ b/plugins/woocommerce/changelog/2023-05-02-09-36-02-782439
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+
+Updated product description tips text.
+
diff --git a/plugins/woocommerce/changelog/26827-checkout-place-order-events b/plugins/woocommerce/changelog/26827-checkout-place-order-events
new file mode 100644
index 00000000000..39538af1f4c
--- /dev/null
+++ b/plugins/woocommerce/changelog/26827-checkout-place-order-events
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Makes more information available to handlers for the `checkout_place_order` (and related) events.
diff --git a/plugins/woocommerce/changelog/add-36989 b/plugins/woocommerce/changelog/add-36989
new file mode 100644
index 00000000000..dcd8bec3ad0
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-36989
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Get feature flags from client side
diff --git a/plugins/woocommerce/changelog/add-37985 b/plugins/woocommerce/changelog/add-37985
new file mode 100644
index 00000000000..fc2c2d5017d
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-37985
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add Sale price validation#37985
diff --git a/plugins/woocommerce/changelog/add-38044 b/plugins/woocommerce/changelog/add-38044
new file mode 100644
index 00000000000..25b146641e5
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-38044
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Update shipping class block to match new designs#38044
diff --git a/plugins/woocommerce/changelog/add-38118 b/plugins/woocommerce/changelog/add-38118
new file mode 100644
index 00000000000..0eacd4bb8a5
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-38118
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add tinymce scripts to product editor pages
diff --git a/plugins/woocommerce/changelog/add-38200 b/plugins/woocommerce/changelog/add-38200
new file mode 100644
index 00000000000..9cee901e3f9
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-38200
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Only register blocks when user navigates to the product edit page#38200
diff --git a/plugins/woocommerce/changelog/add-38285-add-filter-to-free-extensions-rest-endpoint b/plugins/woocommerce/changelog/add-38285-add-filter-to-free-extensions-rest-endpoint
new file mode 100644
index 00000000000..6305f77401c
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-38285-add-filter-to-free-extensions-rest-endpoint
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add a filter to free extensions REST endpoint
diff --git a/plugins/woocommerce/changelog/add-core-profiler-business-location b/plugins/woocommerce/changelog/add-core-profiler-business-location
new file mode 100644
index 00000000000..10ef0ee13e7
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-core-profiler-business-location
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add Business Location page to the new core profiler
diff --git a/plugins/woocommerce/changelog/add-core-profiler-business-location copy b/plugins/woocommerce/changelog/add-core-profiler-business-location copy
new file mode 100644
index 00000000000..7ce227d6fee
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-core-profiler-business-location copy	
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add wccom/migrate link in nux
diff --git a/plugins/woocommerce/changelog/add-core-profiler-fetch-extensions b/plugins/woocommerce/changelog/add-core-profiler-fetch-extensions
new file mode 100644
index 00000000000..7764cee8352
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-core-profiler-fetch-extensions
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Added async fetching for extensions and countries lists in new core profiler
diff --git a/plugins/woocommerce/changelog/add-core-profiler-user-profile b/plugins/woocommerce/changelog/add-core-profiler-user-profile
new file mode 100644
index 00000000000..72b4a3e4bf8
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-core-profiler-user-profile
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add core profiler user profile page
diff --git a/plugins/woocommerce/changelog/add-credit-card-i18n-context b/plugins/woocommerce/changelog/add-credit-card-i18n-context
new file mode 100644
index 00000000000..d4a62357142
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-credit-card-i18n-context
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Add context to translatable strings for credit card labels.
diff --git a/plugins/woocommerce/changelog/add-lint-branch b/plugins/woocommerce/changelog/add-lint-branch
new file mode 100644
index 00000000000..373f4baf283
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-lint-branch
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Add a composer script to run phpcs-changed against the current branch
diff --git a/plugins/woocommerce/changelog/add-plugin-install-queue-endpoint b/plugins/woocommerce/changelog/add-plugin-install-queue-endpoint
new file mode 100644
index 00000000000..f24bafa05db
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-plugin-install-queue-endpoint
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Add new REST endpoints at onboarding/plugins to support async plugin installation with real time error tracking.
diff --git a/plugins/woocommerce/changelog/add-rest-api-products-featured-image b/plugins/woocommerce/changelog/add-rest-api-products-featured-image
deleted file mode 100644
index 0592a983c8f..00000000000
--- a/plugins/woocommerce/changelog/add-rest-api-products-featured-image
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Add `featured` field to the images array for Product REST API
diff --git a/plugins/woocommerce/changelog/add-shipping-tracks b/plugins/woocommerce/changelog/add-shipping-tracks
new file mode 100644
index 00000000000..e9589801cfa
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-shipping-tracks
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Add tracks events to shipping settings
diff --git a/plugins/woocommerce/changelog/add-tracker_unique_payment_method b/plugins/woocommerce/changelog/add-tracker_unique_payment_method
new file mode 100644
index 00000000000..70422153c08
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-tracker_unique_payment_method
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+In the WC Tracker, group payment methods and origins ignoring unique ids within their names.
diff --git a/plugins/woocommerce/changelog/add-tt3-comp-button-classes b/plugins/woocommerce/changelog/add-tt3-comp-button-classes
new file mode 100644
index 00000000000..935235e217f
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-tt3-comp-button-classes
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Added missing button element classes in account orders and downloads pages
diff --git a/plugins/woocommerce/changelog/add-wccom-installer-version-2 b/plugins/woocommerce/changelog/add-wccom-installer-version-2
deleted file mode 100644
index 72aef2f644f..00000000000
--- a/plugins/woocommerce/changelog/add-wccom-installer-version-2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Add plugin installer version independent of WP cron.
\ No newline at end of file
diff --git a/plugins/woocommerce/changelog/add-wp-env-unit-tests b/plugins/woocommerce/changelog/add-wp-env-unit-tests
new file mode 100644
index 00000000000..880ea03f9da
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-wp-env-unit-tests
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: This is a script and CI-only change
+
+
diff --git a/plugins/woocommerce/changelog/dev-37219_add_hook_to_remove_order_items b/plugins/woocommerce/changelog/dev-37219_add_hook_to_remove_order_items
new file mode 100644
index 00000000000..c7c1f077ecd
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-37219_add_hook_to_remove_order_items
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Add action hooks to WC_Abstract_Order::remove_order_items
diff --git a/plugins/woocommerce/changelog/dev-37989_allow_dropdown_recording_for_wc_settings b/plugins/woocommerce/changelog/dev-37989_allow_dropdown_recording_for_wc_settings
new file mode 100644
index 00000000000..82e22e14ca0
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-37989_allow_dropdown_recording_for_wc_settings
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Modify 'WC_Settings_Tracking' to allow dropdown options recording for WooCommerce Settings
diff --git a/plugins/woocommerce/changelog/dev-38080_rename_generate_variations_button b/plugins/woocommerce/changelog/dev-38080_rename_generate_variations_button
new file mode 100644
index 00000000000..075077ccfe9
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-38080_rename_generate_variations_button
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Variations - Rename Generate variations button after variations are created.
diff --git a/plugins/woocommerce/changelog/dev-38122_remove_separator_between_buttons_and_empty_state_screen b/plugins/woocommerce/changelog/dev-38122_remove_separator_between_buttons_and_empty_state_screen
new file mode 100644
index 00000000000..2f55bda0169
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-38122_remove_separator_between_buttons_and_empty_state_screen
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Variations - Remove separator between buttons and empty state screen
diff --git a/plugins/woocommerce/changelog/dev-add-tracks-tests b/plugins/woocommerce/changelog/dev-add-tracks-tests
new file mode 100644
index 00000000000..93af077ad47
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-add-tracks-tests
@@ -0,0 +1,3 @@
+Significance: patch
+Type: dev
+Comment: Add jest tests to certain critical tracks events on React components
diff --git a/plugins/woocommerce/changelog/dev-clean-up-task-list b/plugins/woocommerce/changelog/dev-clean-up-task-list
new file mode 100644
index 00000000000..7e60d34da07
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-clean-up-task-list
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Cleanup task list and organize tasks file structure
diff --git a/plugins/woocommerce/changelog/dev-core-profiler-model-tests b/plugins/woocommerce/changelog/dev-core-profiler-model-tests
new file mode 100644
index 00000000000..992d2a5c518
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-core-profiler-model-tests
@@ -0,0 +1,6 @@
+Significance: patch
+Type: dev
+
+Added model based testing for new core profiler
+
+ 
diff --git a/plugins/woocommerce/changelog/dev-update-task-list-docs-example b/plugins/woocommerce/changelog/dev-update-task-list-docs-example
new file mode 100644
index 00000000000..6921ff5bbbe
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-update-task-list-docs-example
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Update tasklist documentation/example
diff --git a/plugins/woocommerce/changelog/e2e-breakdown-create-variable-spec b/plugins/woocommerce/changelog/e2e-breakdown-create-variable-spec
new file mode 100644
index 00000000000..03f7393df9e
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-breakdown-create-variable-spec
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Break down the "create-variable-product" spec into smaller specs.
diff --git a/plugins/woocommerce/changelog/e2e-gutenberg-latest-nightly b/plugins/woocommerce/changelog/e2e-gutenberg-latest-nightly
new file mode 100644
index 00000000000..0108ab068b4
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-gutenberg-latest-nightly
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Add Gutenberg nightly and latest stable into the daily and release smoke tests.
diff --git a/plugins/woocommerce/changelog/e2e-increase-timeouts b/plugins/woocommerce/changelog/e2e-increase-timeouts
new file mode 100644
index 00000000000..d3e8ebb71a9
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-increase-timeouts
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Increase default timeout and test timeout of create-variable-product spec.
diff --git a/plugins/woocommerce/changelog/e2e-playwright-1_33 b/plugins/woocommerce/changelog/e2e-playwright-1_33
new file mode 100644
index 00000000000..e0e2bb0a160
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-playwright-1_33
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Update Playwright to 1.33 and introduce UI command
diff --git a/plugins/woocommerce/changelog/e2e-pw-add-merchant-create-page b/plugins/woocommerce/changelog/e2e-pw-add-merchant-create-page
new file mode 100644
index 00000000000..aa2003f2187
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-pw-add-merchant-create-page
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add e2e test for Merchant > Pages > Can create a new page
diff --git a/plugins/woocommerce/changelog/e2e-pw-add-merchant-create-post b/plugins/woocommerce/changelog/e2e-pw-add-merchant-create-post
new file mode 100644
index 00000000000..1be8cca7d69
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-pw-add-merchant-create-post
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add e2e test for Merchant > Posts > Can create a new post
diff --git a/plugins/woocommerce/changelog/e2e-readme-playwright-ui-mode b/plugins/woocommerce/changelog/e2e-readme-playwright-ui-mode
new file mode 100644
index 00000000000..489b3617d0d
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-readme-playwright-ui-mode
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Add instruction to run Playwright UI mode in E2E readme.
diff --git a/plugins/woocommerce/changelog/e2e-release-fix-upload-test b/plugins/woocommerce/changelog/e2e-release-fix-upload-test
deleted file mode 100644
index 571ed84a0f9..00000000000
--- a/plugins/woocommerce/changelog/e2e-release-fix-upload-test
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-
-Fix recent failures in "Smoke test release" workflow.
diff --git a/plugins/woocommerce/changelog/e2e-remove-daily-playwright-config b/plugins/woocommerce/changelog/e2e-remove-daily-playwright-config
new file mode 100644
index 00000000000..ef5335e2509
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-remove-daily-playwright-config
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Remove daily.playwright.config.js and references to it.
diff --git a/plugins/woocommerce/changelog/e2e-update-timeout-readme b/plugins/woocommerce/changelog/e2e-update-timeout-readme
new file mode 100644
index 00000000000..340fd7dec7a
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-update-timeout-readme
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Update the E2E test timeout to 90 sec, and update the E2E README.
diff --git a/plugins/woocommerce/changelog/enhancement-add-held-stock-note b/plugins/woocommerce/changelog/enhancement-add-held-stock-note
new file mode 100644
index 00000000000..7e8b1de222a
--- /dev/null
+++ b/plugins/woocommerce/changelog/enhancement-add-held-stock-note
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Add order note to display held stock inventory to provide more visibility to merchants.
diff --git a/plugins/woocommerce/changelog/fix-265-add-k6-hpos-baseline b/plugins/woocommerce/changelog/fix-265-add-k6-hpos-baseline
new file mode 100644
index 00000000000..bbd5512f833
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-265-add-k6-hpos-baseline
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add HPOS specific k6 test suite
diff --git a/plugins/woocommerce/changelog/fix-26543 b/plugins/woocommerce/changelog/fix-26543
new file mode 100644
index 00000000000..ce8fc5a5307
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-26543
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Save an order created via the REST API to prevent overrides from 3rd party plugins or themes if they try to add fees to the order.
diff --git a/plugins/woocommerce/changelog/fix-33322 b/plugins/woocommerce/changelog/fix-33322
new file mode 100644
index 00000000000..32b23c79463
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-33322
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Swap out deprecated jQuery ready handlers
diff --git a/plugins/woocommerce/changelog/fix-34127 b/plugins/woocommerce/changelog/fix-34127
new file mode 100644
index 00000000000..a5e76e2226e
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-34127
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Prevent login call if the user is already logged in.
diff --git a/plugins/woocommerce/changelog/fix-34804-2 b/plugins/woocommerce/changelog/fix-34804-2
new file mode 100644
index 00000000000..76b1842471e
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-34804-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: performance
+
+Compute if any order is pending, when deciding to process next migration batch
diff --git a/plugins/woocommerce/changelog/fix-37108 b/plugins/woocommerce/changelog/fix-37108
new file mode 100644
index 00000000000..f2e5f833c5e
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37108
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add admin-side order edit lock for HPOS.
diff --git a/plugins/woocommerce/changelog/fix-37451-store-details-complete b/plugins/woocommerce/changelog/fix-37451-store-details-complete
new file mode 100644
index 00000000000..aacdf3ac42d
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37451-store-details-complete
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix "Add store details" task fails to mark as completed for selecting Nigeria based address
diff --git a/plugins/woocommerce/changelog/fix-37502 b/plugins/woocommerce/changelog/fix-37502
new file mode 100644
index 00000000000..115429c4b01
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37502
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Correct spelling errors
diff --git a/plugins/woocommerce/changelog/fix-37599 b/plugins/woocommerce/changelog/fix-37599
new file mode 100644
index 00000000000..426713de61f
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37599
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Add the product name to the "Remove from cart" button's aria-label in the cart and mini cart.
\ No newline at end of file
diff --git a/plugins/woocommerce/changelog/fix-37601 b/plugins/woocommerce/changelog/fix-37601
new file mode 100644
index 00000000000..eeea8c4ae5f
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37601
@@ -0,0 +1,5 @@
+Significance: minor
+Type: add
+
+Add a function to get the aria-describedby description for the add to cart button.
+Add default description for the Select options button.
\ No newline at end of file
diff --git a/plugins/woocommerce/changelog/fix-37806 b/plugins/woocommerce/changelog/fix-37806
new file mode 100644
index 00000000000..fe00a2ff37d
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37806
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+When deleting an administrator user, any existing webhook(s) owned to the user being deleted are re-assigned to the nominated user if the "Attribute all content to" option is chosen, or re-assigned to user id zero. This helps avoid `woocommerce_rest_cannot_view` webhook payload errors.
diff --git a/plugins/woocommerce/changelog/fix-38093-tracks-id-mismatch b/plugins/woocommerce/changelog/fix-38093-tracks-id-mismatch
new file mode 100644
index 00000000000..a0a745aebee
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-38093-tracks-id-mismatch
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix tracks user ID mismatch between PHP and JS when Jetpack is active and connected
diff --git a/plugins/woocommerce/changelog/fix-38149 b/plugins/woocommerce/changelog/fix-38149
new file mode 100644
index 00000000000..8f69c391f13
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-38149
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add WooCommerce Admin page class to body of every page
diff --git a/plugins/woocommerce/changelog/fix-38242_editor_hidden_in_firefox b/plugins/woocommerce/changelog/fix-38242_editor_hidden_in_firefox
new file mode 100644
index 00000000000..962598f3daf
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-38242_editor_hidden_in_firefox
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Add support for `showHeader` config in router config to hide header if needed.
diff --git a/plugins/woocommerce/changelog/fix-38317 b/plugins/woocommerce/changelog/fix-38317
new file mode 100644
index 00000000000..a45fe6f6e9e
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-38317
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Add support to verify specific order types.
diff --git a/plugins/woocommerce/changelog/fix-38320 b/plugins/woocommerce/changelog/fix-38320
new file mode 100644
index 00000000000..ae0192dd5b6
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-38320
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Support strict SQL modes in HPOS migration that dont allow zero date values.
diff --git a/plugins/woocommerce/changelog/fix-activity-icon b/plugins/woocommerce/changelog/fix-activity-icon
new file mode 100644
index 00000000000..712d6de3063
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-activity-icon
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix activity panel not showing unread when closed
diff --git a/plugins/woocommerce/changelog/fix-k6-api-40X-errors b/plugins/woocommerce/changelog/fix-k6-api-40X-errors
index ab162eedf69..a9cf0d4ef6e 100644
--- a/plugins/woocommerce/changelog/fix-k6-api-40X-errors
+++ b/plugins/woocommerce/changelog/fix-k6-api-40X-errors
@@ -1,4 +1,4 @@
 Significance: patch
 Type: fix
 
-skip k6 api order RUD tests on non-existant order when C test fails
+skip k6 api order RUD tests on non-existent order when C test fails
diff --git a/plugins/woocommerce/changelog/fix-k6-api-batch-orders b/plugins/woocommerce/changelog/fix-k6-api-batch-orders
new file mode 100644
index 00000000000..f3489683645
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-k6-api-batch-orders
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+skip k6 batch update when batch create fails
diff --git a/plugins/woocommerce/changelog/fix-load-sample-product-modal b/plugins/woocommerce/changelog/fix-load-sample-product-modal
new file mode 100644
index 00000000000..c0f718c3c16
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-load-sample-product-modal
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix loading sample product's progress message is misaligned if Gutenberg plugin is enabled
diff --git a/plugins/woocommerce/changelog/fix-manage-store-panel-padding b/plugins/woocommerce/changelog/fix-manage-store-panel-padding
new file mode 100644
index 00000000000..6a3af3702fd
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-manage-store-panel-padding
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Add a 24px spacing to store management body
diff --git a/plugins/woocommerce/changelog/fix-move_template_addition_to_featureflag b/plugins/woocommerce/changelog/fix-move_template_addition_to_featureflag
new file mode 100644
index 00000000000..c1967d0f6a9
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-move_template_addition_to_featureflag
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Only add product template when new editor feature flag is enabled.
diff --git a/plugins/woocommerce/changelog/fix-option-notice b/plugins/woocommerce/changelog/fix-option-notice
new file mode 100644
index 00000000000..23afe5377ed
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-option-notice
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix get_options deprecation notice
diff --git a/plugins/woocommerce/changelog/fix-order-upshifting b/plugins/woocommerce/changelog/fix-order-upshifting
new file mode 100644
index 00000000000..42ea7acfddb
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-order-upshifting
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix: when order is deleted child orders should be deleted too, not set to parent id 0, unless the post type for the order is hierarchical
diff --git a/plugins/woocommerce/changelog/fix-product-add-attributes-race-condition b/plugins/woocommerce/changelog/fix-product-add-attributes-race-condition
new file mode 100644
index 00000000000..2f004caa367
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-product-add-attributes-race-condition
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixes a race condition when adding the first attribute form to the product edit screen.
diff --git a/plugins/woocommerce/changelog/fix-remove-product-attribute-message b/plugins/woocommerce/changelog/fix-remove-product-attribute-message
new file mode 100644
index 00000000000..6b84d7ee687
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-remove-product-attribute-message
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Show correct confirmation message when removing an attribute from a product.
diff --git a/plugins/woocommerce/changelog/fix-shipping-tour b/plugins/woocommerce/changelog/fix-shipping-tour
new file mode 100644
index 00000000000..17123952fb4
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-shipping-tour
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix shipping tour layout context error
diff --git a/plugins/woocommerce/changelog/fix-spelling-errors-rin-transformers-readme b/plugins/woocommerce/changelog/fix-spelling-errors-rin-transformers-readme
new file mode 100644
index 00000000000..5e5fa537618
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-spelling-errors-rin-transformers-readme
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Fix spelling errors in Remote Inbox Notifications Transformers documentation.
diff --git a/plugins/woocommerce/changelog/fix-tasklist-completion-message b/plugins/woocommerce/changelog/fix-tasklist-completion-message
new file mode 100644
index 00000000000..bd50f58368e
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-tasklist-completion-message
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix task list progress title when no tasks are completed
diff --git a/plugins/woocommerce/changelog/fix-tt3-attributes-table b/plugins/woocommerce/changelog/fix-tt3-attributes-table
new file mode 100644
index 00000000000..4d799f85715
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-tt3-attributes-table
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Fixed the attributes table styling in TT3 tabs content area
diff --git a/plugins/woocommerce/changelog/fix-tt3-order-details-item-meta-styling b/plugins/woocommerce/changelog/fix-tt3-order-details-item-meta-styling
new file mode 100644
index 00000000000..de43fcc6ec9
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-tt3-order-details-item-meta-styling
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Add default styles for product meta in the TT3 order details table
diff --git a/plugins/woocommerce/changelog/fix-wc-experimental-i18n b/plugins/woocommerce/changelog/fix-wc-experimental-i18n
new file mode 100644
index 00000000000..ff9e7653252
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-wc-experimental-i18n
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix wc-experimental not translated issue
diff --git a/plugins/woocommerce/changelog/fix-woocommerce_admin_updated-does-not-run b/plugins/woocommerce/changelog/fix-woocommerce_admin_updated-does-not-run
new file mode 100644
index 00000000000..3b50bb74c0c
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-woocommerce_admin_updated-does-not-run
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Add missing woocommerce_run_on_woocommerce_admin_updated hook for the scheduled action registered in RemoteInboxNotificationsEngine
diff --git a/plugins/woocommerce/changelog/hide_state_from_ethiopia_and_rwanda b/plugins/woocommerce/changelog/hide_state_from_ethiopia_and_rwanda
new file mode 100644
index 00000000000..30ba302229b
--- /dev/null
+++ b/plugins/woocommerce/changelog/hide_state_from_ethiopia_and_rwanda
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Hide state selector for Ethiopia and Rwanda addresses
diff --git a/plugins/woocommerce/changelog/p b/plugins/woocommerce/changelog/p
new file mode 100644
index 00000000000..4b274108f6e
--- /dev/null
+++ b/plugins/woocommerce/changelog/p
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Fallback to simply not display any prices rather than empty prices and re-enable Purchase unit tests
diff --git a/plugins/woocommerce/changelog/pr-35232 b/plugins/woocommerce/changelog/pr-35232
new file mode 100644
index 00000000000..de028255c9e
--- /dev/null
+++ b/plugins/woocommerce/changelog/pr-35232
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+fix logout vs log out typo
\ No newline at end of file
diff --git a/plugins/woocommerce/changelog/pr-36868 b/plugins/woocommerce/changelog/pr-36868
new file mode 100644
index 00000000000..5f204cf5fea
--- /dev/null
+++ b/plugins/woocommerce/changelog/pr-36868
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+use correct escaping function
\ No newline at end of file
diff --git a/plugins/woocommerce/changelog/remove-onboarding-hook b/plugins/woocommerce/changelog/remove-onboarding-hook
new file mode 100644
index 00000000000..eb75c25987e
--- /dev/null
+++ b/plugins/woocommerce/changelog/remove-onboarding-hook
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Remove Core onboarding usage of woocommerce_updated hook
diff --git a/plugins/woocommerce/changelog/remove-qs b/plugins/woocommerce/changelog/remove-qs
new file mode 100644
index 00000000000..f93da22a4c3
--- /dev/null
+++ b/plugins/woocommerce/changelog/remove-qs
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Remove `qs` dependency from `woocommerce-admin`
diff --git a/plugins/woocommerce/changelog/remove-wp-env-workaround b/plugins/woocommerce/changelog/remove-wp-env-workaround
new file mode 100644
index 00000000000..6fab7905e6e
--- /dev/null
+++ b/plugins/woocommerce/changelog/remove-wp-env-workaround
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Removed wp-env workaround since the bug has been fixed
diff --git a/plugins/woocommerce/changelog/try-install-optim-2 b/plugins/woocommerce/changelog/try-install-optim-2
new file mode 100644
index 00000000000..c04ab984d37
--- /dev/null
+++ b/plugins/woocommerce/changelog/try-install-optim-2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Optimize installation routine by reducing the number of DELETE statments for admin notices.
diff --git a/plugins/woocommerce/changelog/update-38260 b/plugins/woocommerce/changelog/update-38260
new file mode 100644
index 00000000000..512942f54a6
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-38260
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Remove icons from product editor template
diff --git a/plugins/woocommerce/changelog/update-38408-update-free-extensions-for-core-profiler b/plugins/woocommerce/changelog/update-38408-update-free-extensions-for-core-profiler
new file mode 100644
index 00000000000..a207150ee02
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-38408-update-free-extensions-for-core-profiler
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Add obw/core-profiler to the free-extensions endpoint
diff --git a/plugins/woocommerce/changelog/update-additional-payment-task-view-logic b/plugins/woocommerce/changelog/update-additional-payment-task-view-logic
new file mode 100644
index 00000000000..25c7cef63d3
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-additional-payment-task-view-logic
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update "Set up additional payment" task view & complete logic
diff --git a/plugins/woocommerce/changelog/update-attribute-empty-state b/plugins/woocommerce/changelog/update-attribute-empty-state
new file mode 100644
index 00000000000..6086429a5de
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-attribute-empty-state
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update empty state for product attributes tab.
diff --git a/plugins/woocommerce/changelog/update-cart-fragments-enqueue b/plugins/woocommerce/changelog/update-cart-fragments-enqueue
new file mode 100644
index 00000000000..a5d54ea0ed0
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-cart-fragments-enqueue
@@ -0,0 +1,4 @@
+Significance: minor
+Type: performance
+
+Removed global enqueue of wc-cart-fragments. Moved to the cart widget (its main consumer).
diff --git a/plugins/woocommerce/changelog/update-change-product-category-metabox-enqueue b/plugins/woocommerce/changelog/update-change-product-category-metabox-enqueue
new file mode 100644
index 00000000000..b79b4c21182
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-change-product-category-metabox-enqueue
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Change product-category-metabox JS/style enqueue logic
diff --git a/plugins/woocommerce/changelog/update-hide-logo-step-if-not-support b/plugins/woocommerce/changelog/update-hide-logo-step-if-not-support
new file mode 100644
index 00000000000..945d32e92f2
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-hide-logo-step-if-not-support
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Hide upload logo step in Personalize task if theme doesn't support it
diff --git a/plugins/woocommerce/changelog/update-migrate-purchase-task-to-ts b/plugins/woocommerce/changelog/update-migrate-purchase-task-to-ts
new file mode 100644
index 00000000000..8c052ce352b
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-migrate-purchase-task-to-ts
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Migrate tasks fills index.js, purchase.tsx and related utils to TS
diff --git a/plugins/woocommerce/changelog/update-payfast b/plugins/woocommerce/changelog/update-payfast
new file mode 100644
index 00000000000..f0568c41ad4
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-payfast
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update Payfast's title and logo
diff --git a/plugins/woocommerce/changelog/update-product_attributes_add b/plugins/woocommerce/changelog/update-product_attributes_add
new file mode 100644
index 00000000000..445d4946db6
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-product_attributes_add
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Rename tracks event product_attributes_add to product_attributes_save on the product page and update attributes
diff --git a/plugins/woocommerce/changelog/update-remove-non-variation-attribute-no-confirm b/plugins/woocommerce/changelog/update-remove-non-variation-attribute-no-confirm
new file mode 100644
index 00000000000..c82989eccac
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-remove-non-variation-attribute-no-confirm
@@ -0,0 +1,4 @@
+Significance: minor
+Type: tweak
+
+Don't show confirmation message when removing a non-variation attribute from a product.
diff --git a/plugins/woocommerce/changelog/update-remove-sample-data-from-product-templates b/plugins/woocommerce/changelog/update-remove-sample-data-from-product-templates
new file mode 100644
index 00000000000..be3ac1d7c9b
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-remove-sample-data-from-product-templates
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Remove sample data from product templates
diff --git a/plugins/woocommerce/changelog/update-tax-location-form b/plugins/woocommerce/changelog/update-tax-location-form
new file mode 100644
index 00000000000..33a64afc1af
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-tax-location-form
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Make all fields in the tax location form mandatory
diff --git a/plugins/woocommerce/changelog/update-update-rin-transformers-doc b/plugins/woocommerce/changelog/update-update-rin-transformers-doc
new file mode 100644
index 00000000000..8e03ffd0ae7
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-update-rin-transformers-doc
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update transformers doc with examples
diff --git a/plugins/woocommerce/changelog/update-variations-empty-state b/plugins/woocommerce/changelog/update-variations-empty-state
new file mode 100644
index 00000000000..13b7ea5ef48
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-variations-empty-state
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Always show the product variations empty state with message when there are no "used for variations" attributes on a product.
diff --git a/plugins/woocommerce/changelog/update-woocommerce-blocks-10.0.4 b/plugins/woocommerce/changelog/update-woocommerce-blocks-10.0.4
new file mode 100644
index 00000000000..be096406d18
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-woocommerce-blocks-10.0.4
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Woo Blocks 10.0.4
diff --git a/plugins/woocommerce/changelog/update-woocommerce-blocks-10.2.0 b/plugins/woocommerce/changelog/update-woocommerce-blocks-10.2.0
new file mode 100644
index 00000000000..9366f9e517f
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-woocommerce-blocks-10.2.0
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Update WooCommerce Blocks to 10.2.0
diff --git a/plugins/woocommerce/changelog/update-woocommerce-blocks-10.2.1 b/plugins/woocommerce/changelog/update-woocommerce-blocks-10.2.1
new file mode 100644
index 00000000000..a7792d8a143
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-woocommerce-blocks-10.2.1
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update WooCommerce Blocks to 10.2.1
diff --git a/plugins/woocommerce/changelog/update-wp-env-7.0.0 b/plugins/woocommerce/changelog/update-wp-env-7.0.0
new file mode 100644
index 00000000000..f7dace12d1d
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-wp-env-7.0.0
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Dev-only change
+
+
diff --git a/plugins/woocommerce/changelog/woocommer-thumb-issue b/plugins/woocommerce/changelog/woocommer-thumb-issue
new file mode 100644
index 00000000000..869f0e8781e
--- /dev/null
+++ b/plugins/woocommerce/changelog/woocommer-thumb-issue
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Improve spacing of product gallery thumbs when using the Twenty Twenty-Two theme.
diff --git a/plugins/woocommerce/client/admin/config/core.json b/plugins/woocommerce/client/admin/config/core.json
index e40294bf810..f459a59c027 100644
--- a/plugins/woocommerce/client/admin/config/core.json
+++ b/plugins/woocommerce/client/admin/config/core.json
@@ -2,7 +2,7 @@
 	"features": {
 		"activity-panels": true,
 		"analytics": true,
-		"product-block-editor": false,
+		"product-block-editor": true,
 		"coupons": true,
 		"core-profiler": false,
 		"customer-effort-score-tracks": true,
diff --git a/plugins/woocommerce/client/admin/config/development.json b/plugins/woocommerce/client/admin/config/development.json
index ed607a5e481..4c3174ce817 100644
--- a/plugins/woocommerce/client/admin/config/development.json
+++ b/plugins/woocommerce/client/admin/config/development.json
@@ -15,7 +15,7 @@
 		"minified-js": true,
 		"mobile-app-banner": true,
 		"navigation": true,
-		"new-product-management-experience": true,
+		"new-product-management-experience": false,
 		"onboarding": true,
 		"onboarding-tasks": true,
 		"payment-gateway-suggestions": true,
diff --git a/plugins/woocommerce/client/legacy/css/admin.scss b/plugins/woocommerce/client/legacy/css/admin.scss
index 1c05ea84d1f..6d5a19cc9b1 100644
--- a/plugins/woocommerce/client/legacy/css/admin.scss
+++ b/plugins/woocommerce/client/legacy/css/admin.scss
@@ -1071,27 +1071,38 @@ $default-line-height: 18px;
 		}
 	}
 
-	.add-variation-container {
-		@extend %container-defaults;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		gap: 24px;
-		position: relative;
-
-		.arrow-image-wrapper {
-			position: absolute;
-			top: 10px;
-			left: 87px;
+	#variable_product_options_inner {
+		> .toolbar:not(.expand-close-hidden) {
+			border-bottom: 1px solid #eee;
 		}
-
-		p {
-			@extend %centered-text;
-		}
-
-		&.hidden {
+		.add-variation-container {
 			display: none;
 		}
+
+		&.no-variations {
+			> .toolbar:not(.expand-close-hidden) {
+				border-bottom: none;
+			}
+			.add-variation-container {
+				display: flex;
+				@extend %container-defaults;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				gap: 24px;
+				position: relative;
+
+				.arrow-image-wrapper {
+					position: absolute;
+					top: 10px;
+					left: 87px;
+				}
+
+				p {
+					@extend %centered-text;
+				}
+			}
+		}
 	}
 }
 
@@ -1130,7 +1141,6 @@ $default-line-height: 18px;
 	}
 	.toolbar-top {
 		.button,
-		.attribute_taxonomy,
 		.select2-container {
 			margin: 1px;
 		}
@@ -2789,6 +2799,10 @@ ul.wc_coupon_list_block {
 			padding: 1em 1em 1em 1em !important;
 			vertical-align: middle;
 
+			.locked-indicator {
+				margin-left: 0;
+			}
+
 			input {
 				vertical-align: text-top;
 				margin: 1px 0;
@@ -2870,6 +2884,14 @@ ul.wc_coupon_list_block {
 	}
 }
 
+.woocommerce_page_wc-orders .wp-list-table .locked-indicator-icon {
+	margin-left: -2px;
+
+	&:before {
+		vertical-align: top;
+	}
+}
+
 .order-status {
 	display: inline-flex;
 	line-height: 2.5em;
@@ -5505,13 +5527,15 @@ img.help_tip {
   * WooCommerce meta boxes
   */
 .wc-metaboxes-wrapper {
+	:not(#variable_product_options_inner) {
+		.toolbar:not(.expand-close-hidden) {
+		  border-bottom: 1px solid #eee;
+		}
+	}
 	.toolbar {
 		margin: 0 !important;
 		border-top: 1px solid white;
 		padding: 9px 12px !important;
-		&:not(.expand-close-hidden) {
-			border-bottom: 1px solid #eee;
-		}
 
 		&:first-child {
 			border-top: 0;
diff --git a/plugins/woocommerce/client/legacy/css/twenty-twenty-three.scss b/plugins/woocommerce/client/legacy/css/twenty-twenty-three.scss
index fa60336cd44..39ba82135fe 100644
--- a/plugins/woocommerce/client/legacy/css/twenty-twenty-three.scss
+++ b/plugins/woocommerce/client/legacy/css/twenty-twenty-three.scss
@@ -595,12 +595,28 @@ ul.wc-tabs {
 	font-size: var(--wp--preset--font-size--small);
 	margin-left: 1em;
 
-	h2 {
+	// Hide repeated heading.
+	h2:first-of-type {
 		display: none;
 	}
 
+	// Attributes table styles.
 	table.woocommerce-product-attributes {
-		text-align: left;
+		tbody {
+
+			td, th {
+				padding: 0.2rem 0.2rem 0.2rem 0;
+
+				p {
+					margin: 0;
+				}
+			}
+
+			th {
+				text-align: left;
+				padding-right: 1rem;
+			}
+		}
 	}
 }
 
@@ -1019,6 +1035,15 @@ ul.wc-tabs {
 		thead th {
 			text-transform: uppercase;
 		}
+
+		.wc-item-meta {
+			list-style-type: none;
+			padding-inline-start: 2rem;
+
+			li > p {
+				margin-block-start: 0.3rem;
+			}
+		}
 	}
 }
 
diff --git a/plugins/woocommerce/client/legacy/css/twenty-twenty.scss b/plugins/woocommerce/client/legacy/css/twenty-twenty.scss
index 6f91033da6c..b30ad604555 100644
--- a/plugins/woocommerce/client/legacy/css/twenty-twenty.scss
+++ b/plugins/woocommerce/client/legacy/css/twenty-twenty.scss
@@ -591,7 +591,7 @@ a.reset_variations {
 
 	.flex-control-thumbs li {
 		width: 14.2857142857%;
-		margin: 0 14.2857142857% 1.6em 0;
+		margin: 0 1em 1.6em 0;
 	}
 
 	.flex-control-thumbs li:nth-child(4n) {
diff --git a/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product-variation.js b/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product-variation.js
index 9381368ffc6..0940deb45a1 100644
--- a/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product-variation.js
+++ b/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product-variation.js
@@ -1060,6 +1060,12 @@ jQuery( function ( $ ) {
 								page = total_pages;
 							}
 
+							if ( total_pages === 0 ) {
+								$( '.generate_variations' ).text(
+									'Generate variations'
+								);
+							}
+
 							wc_meta_boxes_product_variations_pagenav.go_to_page(
 								page,
 								-1
@@ -1126,6 +1132,9 @@ jQuery( function ( $ ) {
 								1,
 								count
 							);
+							$( '.generate_variations' ).text(
+								'Regenerate variations'
+							);
 						} else {
 							wc_meta_boxes_product_variations_ajax.unblock();
 						}
@@ -1296,6 +1305,7 @@ jQuery( function ( $ ) {
 				$( '#variable_product_options' )
 					.find( '.variation-needs-update' )
 					.removeClass( 'variation-needs-update' );
+				$( '.generate_variations' ).text( 'Generate variations' );
 			} else {
 				wc_meta_boxes_product_variations_ajax.check_for_changes();
 			}
@@ -1331,10 +1341,14 @@ jQuery( function ( $ ) {
 				'.woocommerce_variations'
 			);
 			if ( parseInt( wrapper.attr( 'data-total' ) ) > 0 ) {
-				$( '.add-variation-container' ).addClass( 'hidden' );
+				$( '#variable_product_options_inner' ).removeClass(
+					'no-variations'
+				);
 				$( '#field_to_edit' ).removeClass( 'hidden' );
 			} else {
-				$( '.add-variation-container' ).removeClass( 'hidden' );
+				$( '#variable_product_options_inner' ).addClass(
+					'no-variations'
+				);
 				$( '#field_to_edit' ).addClass( 'hidden' );
 			}
 		},
diff --git a/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product.js b/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product.js
index 41b51571584..10026b521e0 100644
--- a/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product.js
+++ b/plugins/woocommerce/client/legacy/js/admin/meta-boxes-product.js
@@ -57,12 +57,6 @@ jQuery( function ( $ ) {
 		} );
 	} );
 
-	$( function () {
-		if ( ! woocommerce_admin_meta_boxes.has_local_attributes ) {
-			$( 'button.add_attribute' ).trigger( 'click' );
-		}
-	} );
-
 	// Catalog Visibility.
 	$( '#catalog-visibility' )
 		.find( '.edit-catalog-visibility' )
@@ -157,10 +151,19 @@ jQuery( function ( $ ) {
 		} )
 		.trigger( 'change' );
 
-	$( 'input#_downloadable, input#_virtual' ).on( 'change', function () {
+	$( 'input#_downloadable' ).on( 'change', function () {
 		show_and_hide_panels();
 	} );
 
+	$( 'input#_virtual' ).on( 'change', function () {
+		show_and_hide_panels();
+
+		// If user enables virtual while on shipping tab, switch to general tab.
+		if ( $( this ).is( ':checked' ) && $( '.shipping_options.shipping_tab' ).hasClass( 'active' ) ) {
+			$( '.general_options.general_tab > a' ).trigger( 'click' );
+		}
+	} );
+
 	function change_product_type_tip( content ) {
 		$( '#tiptip_holder' ).removeAttr( 'style' );
 		$( '#tiptip_arrow' ).removeAttr( 'style' );
@@ -189,7 +192,7 @@ jQuery( function ( $ ) {
 		}
 	}
 
-	function show_and_hide_panels() {
+	function show_and_hide_controls( context ) {
 		var product_type = $( 'select#product-type' ).val();
 		var is_virtual = $( 'input#_virtual:checked' ).length;
 		var is_downloadable = $( 'input#_downloadable:checked' ).length;
@@ -206,33 +209,32 @@ jQuery( function ( $ ) {
 			show_classes = show_classes + ', .show_if_' + value;
 		} );
 
-		$( hide_classes ).show();
-		$( show_classes ).hide();
+		$( hide_classes, context ).show();
+		$( show_classes, context ).hide();
 
 		// Shows rules.
 		if ( is_downloadable ) {
-			$( '.show_if_downloadable' ).show();
+			$( '.show_if_downloadable', context ).show();
 		}
 		if ( is_virtual ) {
-			$( '.show_if_virtual' ).show();
-
-			// If user enables virtual while on shipping tab, switch to general tab.
-			if ( $( '.shipping_options.shipping_tab' ).hasClass( 'active' ) ) {
-				$( '.general_options.general_tab > a' ).trigger( 'click' );
-			}
+			$( '.show_if_virtual', context ).show();
 		}
 
-		$( '.show_if_' + product_type ).show();
+		$( '.show_if_' + product_type, context ).show();
 
 		// Hide rules.
 		if ( is_downloadable ) {
-			$( '.hide_if_downloadable' ).hide();
+			$( '.hide_if_downloadable', context ).hide();
 		}
 		if ( is_virtual ) {
-			$( '.hide_if_virtual' ).hide();
+			$( '.hide_if_virtual', context ).hide();
 		}
 
-		$( '.hide_if_' + product_type ).hide();
+		$( '.hide_if_' + product_type, context ).hide();
+	}
+
+	function show_and_hide_panels() {
+		show_and_hide_controls();
 
 		$( 'input#_manage_stock' ).trigger( 'change' );
 
@@ -244,12 +246,12 @@ jQuery( function ( $ ) {
 				return;
 			}
 
-			var $invisble = $children.filter( function () {
+			var $invisible = $children.filter( function () {
 				return 'none' === $( this ).css( 'display' );
 			} );
 
 			// Hide panel.
-			if ( $invisble.length === $children.length ) {
+			if ( $invisible.length === $children.length ) {
 				var $id = $( this ).prop( 'id' );
 				$( '.product_data_tabs' )
 					.find( 'li a[href="#' + $id + '"]' )
@@ -400,6 +402,14 @@ jQuery( function ( $ ) {
 		.find( '.woocommerce_attribute' )
 		.get();
 
+	// If the product has no attributes, add an empty attribute to be filled out by the user.
+	$( function add_blank_custom_attribute_if_no_attributes() {
+
+		if ( woocommerce_attribute_items.length === 0  ) {
+			add_custom_attribute_to_list();
+		}
+	} );
+
 	woocommerce_attribute_items.sort( function ( a, b ) {
 		var compA = parseInt( $( a ).attr( 'rel' ), 10 );
 		var compB = parseInt( $( b ).attr( 'rel' ), 10 );
@@ -409,7 +419,7 @@ jQuery( function ( $ ) {
 		$( '.product_attributes' ).append( el );
 	} );
 
-	function attribute_row_indexes() {
+	function update_attribute_row_indexes() {
 		$( '.product_attributes .woocommerce_attribute' ).each( function (
 			index,
 			el
@@ -445,123 +455,133 @@ jQuery( function ( $ ) {
 		selectedAttributes
 	);
 
-	function toggle_add_global_attribute_layout() {
-		$( 'div.add-attribute-container' ).toggle();
-		$( 'div.add-global-attribute-container' ).toggle();
-		$( '#product_attributes > .toolbar-buttons' ).toggle();
+	function get_new_attribute_list_item_html( indexInList, globalAttributeId ) {
+		return new Promise( function ( resolve, reject ) {
+			$.post( {
+				url: woocommerce_admin_meta_boxes.ajax_url,
+				data: {
+					action: 'woocommerce_add_attribute',
+					taxonomy: globalAttributeId ?? '',
+					i: indexInList,
+					security: woocommerce_admin_meta_boxes.add_attribute_nonce,
+				},
+				success: function ( newAttributeListItemHtml ) {
+					resolve( newAttributeListItemHtml );
+				},
+				error: function ( jqXHR, textStatus, errorThrown ) {
+					reject( { jqXHR, textStatus, errorThrown } );
+				}
+			} );
+		} );
 	}
 
-	function add_attribute( element, attribute ) {
-		var size = $( '.product_attributes .woocommerce_attribute' ).length;
-		var $wrapper = $( element ).closest( '#product_attributes' );
-		var $attributes = $wrapper.find( '.product_attributes' );
-		var product_type = $( 'select#product-type' ).val();
-		var data = {
-			action: 'woocommerce_add_attribute',
-			taxonomy: attribute,
-			i: size,
-			security: woocommerce_admin_meta_boxes.add_attribute_nonce,
-		};
+	function block_attributes_tab_container() {
+		const $attributesTabContainer = $( '#product_attributes' );
 
-		$wrapper.block( {
+		$attributesTabContainer.block( {
 			message: null,
 			overlayCSS: {
 				background: '#fff',
 				opacity: 0.6,
 			},
 		} );
+	}
 
-		$.post( woocommerce_admin_meta_boxes.ajax_url, data, function (
-			response
-		) {
-			$attributes.append( response );
+	function unblock_attributes_tab_container() {
+		const $attributesTabContainer = $( '#product_attributes' );
+		$attributesTabContainer.unblock();
+	}
 
-			if ( 'variable' !== product_type ) {
-				$attributes.find( '.enable_variation' ).hide();
-			}
+	function toggle_expansion_of_attribute_list_item( $attributeListItem ) {
+		$attributeListItem.find( 'h3' ).trigger( 'click' );
+	}
 
-			$( document.body ).trigger( 'wc-enhanced-select-init' );
+	function init_select_controls() {
+		$( document.body ).trigger( 'wc-enhanced-select-init' );
+	}
 
-			attribute_row_indexes();
+	async function add_attribute_to_list( globalAttributeId ) {
+		try {
+			block_attributes_tab_container();
 
-			$attributes
-				.find( '.woocommerce_attribute' )
-				.last()
-				.find( 'h3' )
-				.trigger( 'click' );
+			const numberOfAttributesInList = $( '.product_attributes .woocommerce_attribute' ).length;
+			const newAttributeListItemHtml = await get_new_attribute_list_item_html( numberOfAttributesInList, globalAttributeId );
 
-			$wrapper.unblock();
+			const $attributesListContainer = $( '#product_attributes .product_attributes' );
+
+			const $attributeListItem = $( newAttributeListItemHtml ).appendTo( $attributesListContainer );
+
+			show_and_hide_controls( $attributeListItem );
+
+			init_select_controls(); // make sure any new select controls in the new list item are initialized
+
+			update_attribute_row_indexes();
+
+			toggle_expansion_of_attribute_list_item( $attributeListItem );
 
-			$( document.body ).trigger( 'woocommerce_added_attribute' );
 			jQuery.maybe_disable_save_button();
-		} );
+		} catch ( error ) {
+			alert( woocommerce_admin_meta_boxes.i18n_add_attribute_error_notice );
+			throw error;
+		} finally {
+			unblock_attributes_tab_container();
+		}
+	}
 
-		if ( attribute ) {
-			$( 'select.attribute_taxonomy' )
-				.find( 'option[value="' + attribute + '"]' )
-				.attr( 'disabled', 'disabled' );
-			$( 'select.attribute_taxonomy' ).val( '' );
+	function add_global_attribute_to_list( globalAttributeId ) {
+		add_attribute_to_list( globalAttributeId );
+	}
+
+	function add_custom_attribute_to_list() {
+		add_attribute_to_list();
+	}
+
+	function add_if_not_exists( arr, item ) {
+		return arr.includes( item ) ? attr : [ ...arr, item ];
+	}
+
+	function disable_in_attribute_search( selectedAttributes ) {
+		$( 'select.wc-attribute-search' ).data( 'disabled-items', selectedAttributes );
+	}
+
+	function remove_blank_custom_attribute_if_no_other_attributes() {
+		const $attributes = $( '.product_attributes .woocommerce_attribute' );
+
+		if ( $attributes.length === 1 ) {
+			const $attribute = $attributes.first();
+
+			const $attributeName = $attribute.find( 'input[name="attribute_names[0]"]' );
+			const $attributeValue = $attribute.find( 'input[name="attribute_values[0]"]' );
+
+			if ( ! $attributeName.val() && ! $attributeValue.val() ) {
+				$attribute.remove();
+			}
 		}
 	}
 
 	$( 'select.wc-attribute-search' ).on( 'select2:select', function ( e ) {
-		if ( e.params && e.params.data && e.params.data.id ) {
-			add_attribute( this, e.params.data.id );
-			if ( ! selectedAttributes.includes( e.params.data.id ) ) {
-				selectedAttributes.push( e.params.data.id );
-				$( 'select.wc-attribute-search' ).data(
-					'disabled-items',
-					selectedAttributes
-				);
-			}
-			window.wcTracks.recordEvent( 'product_attributes_buttons', {
-				action: 'add_existing',
-			} );
+		const attributeId = e?.params?.data?.id;
+
+		if ( attributeId ) {
+			remove_blank_custom_attribute_if_no_other_attributes();
+
+			add_global_attribute_to_list( attributeId );
+
+			selectedAttributes = add_if_not_exists( selectedAttributes, attributeId );
+			disable_in_attribute_search( selectedAttributes );
 		}
+
 		$( this ).val( null );
 		$( this ).trigger( 'change' );
-		if (
-			$( 'div.add-attribute-container' ).hasClass( 'hidden' ) &&
-			! $( 'div.add-global-attribute-container' ).hasClass( 'hidden' )
-		) {
-			toggle_add_global_attribute_layout();
-		}
 
 		return false;
 	} );
 
 	// Add rows.
-	$( 'button.add_attribute' ).on( 'click', function () {
-		var attribute = $( 'select.attribute_taxonomy' ).val();
-		if (
-			! attribute &&
-			$( 'select.attribute_taxonomy' ).hasClass( 'wc-attribute-search' )
-		) {
-			return;
-		}
-		add_attribute( this, attribute );
-		$( 'select.attribute_taxonomy' ).val( null );
-		$( 'select.attribute_taxonomy' ).trigger( 'change' );
-
-		// We record the event only when an existing attribute is added.
-		if ( attribute !== '' ) {
-			window.wcTracks.recordEvent( 'product_attributes_buttons', {
-				action: 'add_existing',
-			} );
-		}
-
-		return false;
-	} );
 
 	$( 'button.add_custom_attribute' ).on( 'click', function () {
-		add_attribute( this, '' );
+		add_custom_attribute_to_list();
 
-		if (
-			$( 'div.add-attribute-container' ).hasClass( 'hidden' ) &&
-			! $( 'div.add-global-attribute-container' ).hasClass( 'hidden' )
-		) {
-			toggle_add_global_attribute_layout();
-		}
 		return false;
 	} );
 
@@ -660,13 +680,12 @@ jQuery( function ( $ ) {
 		'.product_attributes .remove_row',
 		function () {
 			var $parent = $( this ).parent().parent();
-			var confirmMessage = $parent
-				.find( 'input[name^="attribute_variation"]' )
-				.is( ':checked' )
-				? woocommerce_admin_meta_boxes.i18n_remove_used_attribute_confirmation_message
-				: woocommerce_admin_meta_boxes.remove_attribute;
+			var isUsedForVariations = $parent
+			.find( 'input[name^="attribute_variation"]' )
+			.is( ':visible:checked' )
 
-			if ( window.confirm( confirmMessage ) ) {
+			if ( ! isUsedForVariations
+					|| window.confirm( woocommerce_admin_meta_boxes.i18n_remove_used_attribute_confirmation_message ) ) {
 				if ( $parent.is( '.taxonomy' ) ) {
 					$parent.find( 'select, input[type=text]' ).val( '' );
 					$parent.hide();
@@ -685,7 +704,7 @@ jQuery( function ( $ ) {
 				} else {
 					$parent.find( 'select, input[type=text]' ).val( '' );
 					$parent.hide();
-					attribute_row_indexes();
+					update_attribute_row_indexes();
 				}
 
 				$parent.remove();
@@ -694,16 +713,6 @@ jQuery( function ( $ ) {
 					action: 'remove_attribute',
 				} );
 
-				if (
-					! $( '.woocommerce_attribute_data' ).is( ':visible' ) &&
-					! $( 'div.add-global-attribute-container' ).hasClass(
-						'hidden'
-					) &&
-					$( '.product_attributes' ).find( 'input, select, textarea' )
-						.length === 0
-				) {
-					toggle_add_global_attribute_layout();
-				}
 				jQuery.maybe_disable_save_button();
 			}
 			return false;
@@ -726,7 +735,7 @@ jQuery( function ( $ ) {
 		},
 		stop: function ( event, ui ) {
 			ui.item.removeAttr( 'style' );
-			attribute_row_indexes();
+			update_attribute_row_indexes();
 		},
 	} );
 
@@ -734,7 +743,10 @@ jQuery( function ( $ ) {
 	$( '.product_attributes' ).on(
 		'click',
 		'button.add_new_attribute',
-		function () {
+		function ( event ) {
+			// prevent form submission but allow event propagation
+			event.preventDefault();
+
 			$( '.product_attributes' ).block( {
 				message: null,
 				overlayCSS: {
@@ -784,8 +796,6 @@ jQuery( function ( $ ) {
 			} else {
 				$( '.product_attributes' ).unblock();
 			}
-
-			return false;
 		}
 	);
 
diff --git a/plugins/woocommerce/client/legacy/js/admin/wc-status-widget.js b/plugins/woocommerce/client/legacy/js/admin/wc-status-widget.js
index 760d3f07e1c..ec32e7f43bf 100644
--- a/plugins/woocommerce/client/legacy/js/admin/wc-status-widget.js
+++ b/plugins/woocommerce/client/legacy/js/admin/wc-status-widget.js
@@ -1,6 +1,6 @@
 /*global jQuery */
 (function( $ ) {
-	$( document ).on( 'ready', function() {
+	$( function() {
 		window.wcTracks.recordEvent( 'wcadmin_status_widget_view' );
 	});
 
diff --git a/plugins/woocommerce/client/legacy/js/admin/woocommerce_admin.js b/plugins/woocommerce/client/legacy/js/admin/woocommerce_admin.js
index 542f2e9cc4a..138966adf62 100644
--- a/plugins/woocommerce/client/legacy/js/admin/woocommerce_admin.js
+++ b/plugins/woocommerce/client/legacy/js/admin/woocommerce_admin.js
@@ -665,4 +665,91 @@
 			);
 		}
 	} );
+
+	$( function() {
+		/**
+		 * Handles heartbeat integration of order locking when HPOS is enabled.
+		 */
+		var wc_order_lock = {
+			init: function() {
+				// Order screen.
+				this.$lock_dialog = $( '.woocommerce_page_wc-orders #post-lock-dialog.order-lock-dialog' );
+				if ( 0 !== this.$lock_dialog.length && 'undefined' !== typeof woocommerce_admin_meta_boxes ) {
+					$( document ).on( 'heartbeat-send', this.refresh_order_lock );
+					$( document ).on( 'heartbeat-tick', this.check_order_lock );
+				}
+
+				// Orders list table.
+				this.$list_table = $( '.woocommerce_page_wc-orders table.wc-orders-list-table' );
+				if ( 0 !== this.$list_table.length ) {
+					$( document ).on( 'heartbeat-send', this.send_orders_in_list );
+					$( document ).on( 'heartbeat-tick', this.check_orders_in_list );
+				}
+			},
+
+			refresh_order_lock: function( e, data ) {
+				data['wc-refresh-order-lock'] = woocommerce_admin_meta_boxes.post_id;
+			},
+
+			check_order_lock: function( e, data ) {
+				var lock_data = data['wc-refresh-order-lock'];
+
+				if ( ! lock_data || ! lock_data.error ) {
+					// No lock request in heartbeat or lock refreshed ok.
+					return;
+				}
+
+				if ( wc_order_lock.$lock_dialog.is( ':visible' ) ) {
+					return;
+				}
+
+				if ( lock_data.error.user_avatar_src ) {
+					wc_order_lock.$lock_dialog.find( '.post-locked-avatar' ).empty().append(
+						$(
+							'<img />',
+							{
+								'class': 'avatar avatar-64 photo',
+								width: 64,
+								height: 64,
+								alt: '',
+								src: lock_data.error.user_avatar_src,
+								srcset: lock_data.error.user_avatar_src_2x ? lock_data.error.user_avatar_src_2x + ' 2x' : undefined
+							}
+						)
+					);
+				}
+
+				wc_order_lock.$lock_dialog.find( '.currently-editing' ).text( lock_data.error.message );
+				wc_order_lock.$lock_dialog.show();
+				wc_order_lock.$lock_dialog.find( '.wp-tab-first' ).trigger( 'focus' );
+			},
+
+			send_orders_in_list: function( e, data ) {
+				data['wc-check-locked-orders'] = wc_order_lock.$list_table.find( 'tr input[name="order"]' ).map(
+					function() { return this.value; }
+				).get();
+			},
+
+			check_orders_in_list: function( e, data ) {
+				var locked_orders = data['wc-check-locked-orders'] || {};
+
+				wc_order_lock.$list_table.find( 'tr' ).each( function( i, tr ) {
+					var $tr      = $( tr );
+					var order_id = $tr.find( 'input[name="order"]' ).val();
+
+					if ( locked_orders[ order_id ] ) {
+						if ( ! $tr.hasClass( 'wp-locked' ) ) {
+							$tr.find( '.check-column checkbox' ).prop( 'checked', false );
+							$tr.addClass( 'wp-locked' );
+						}
+					} else {
+						$tr.removeClass( 'wp-locked' ).find( '.locked-info span' ).empty();
+					}
+				} );
+			}
+		};
+
+		wc_order_lock.init();
+	} );
+
 } )( jQuery, woocommerce_admin );
diff --git a/plugins/woocommerce/client/legacy/js/frontend/checkout.js b/plugins/woocommerce/client/legacy/js/frontend/checkout.js
index 91a33b69329..02f31aa3eb8 100644
--- a/plugins/woocommerce/client/legacy/js/frontend/checkout.js
+++ b/plugins/woocommerce/client/legacy/js/frontend/checkout.js
@@ -477,7 +477,7 @@ jQuery( function( $ ) {
 
 			// Trigger a handler to let gateways manipulate the checkout if needed
 			// eslint-disable-next-line max-len
-			if ( $form.triggerHandler( 'checkout_place_order' ) !== false && $form.triggerHandler( 'checkout_place_order_' + wc_checkout_form.get_payment_method() ) !== false ) {
+			if ( $form.triggerHandler( 'checkout_place_order', [ wc_checkout_form ] ) !== false && $form.triggerHandler( 'checkout_place_order_' + wc_checkout_form.get_payment_method(), [ wc_checkout_form ] ) !== false ) {
 
 				$form.addClass( 'processing' );
 
@@ -525,7 +525,7 @@ jQuery( function( $ ) {
 						wc_checkout_form.detachUnloadEventsOnSubmit();
 
 						try {
-							if ( 'success' === result.result && $form.triggerHandler( 'checkout_place_order_success', result ) !== false ) {
+							if ( 'success' === result.result && $form.triggerHandler( 'checkout_place_order_success', [ result, wc_checkout_form ] ) !== false ) {
 								if ( -1 === result.redirect.indexOf( 'https://' ) || -1 === result.redirect.indexOf( 'http://' ) ) {
 									window.location = result.redirect;
 								} else {
diff --git a/plugins/woocommerce/client/legacy/js/frontend/woocommerce.js b/plugins/woocommerce/client/legacy/js/frontend/woocommerce.js
index b10ad50d951..734d73cced2 100644
--- a/plugins/woocommerce/client/legacy/js/frontend/woocommerce.js
+++ b/plugins/woocommerce/client/legacy/js/frontend/woocommerce.js
@@ -79,7 +79,7 @@ jQuery( function( $ ) {
 		}
 	};
 
-	// Show password visiblity hover icon on woocommerce forms
+	// Show password visibility hover icon on woocommerce forms
 	$( '.woocommerce form .woocommerce-Input[type="password"]' ).wrap( '<span class="password-input"></span>' );
 	// Add 'password-input' class to the password wrapper in checkout page.
 	$( '.woocommerce form input' ).filter(':password').parent('span').addClass('password-input');
diff --git a/plugins/woocommerce/composer.json b/plugins/woocommerce/composer.json
index 04d18869ae1..d0791fa8172 100644
--- a/plugins/woocommerce/composer.json
+++ b/plugins/woocommerce/composer.json
@@ -2,7 +2,7 @@
 	"name": "woocommerce/woocommerce",
 	"description": "An eCommerce toolkit that helps you sell anything. Beautifully.",
 	"homepage": "https://woocommerce.com/",
-	"version": "7.8.0",
+	"version": "7.9.0",
 	"type": "wordpress-plugin",
 	"license": "GPL-3.0-or-later",
 	"prefer-stable": true,
@@ -21,7 +21,7 @@
 		"maxmind-db/reader": "^1.11",
 		"pelago/emogrifier": "^6.0",
 		"woocommerce/action-scheduler": "3.5.4",
-		"woocommerce/woocommerce-blocks": "10.0.2"
+		"woocommerce/woocommerce-blocks": "10.2.1"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^3.3.0",
@@ -89,10 +89,13 @@
 			"phpcs -s -p"
 		],
 		"lint": [
-			"chg=$(git diff --relative --name-only -- '*.php'); [ -z $chg ] || phpcs-changed -s --git --git-unstaged $chg"
+			"chg=$(git diff --relative --name-only -- '*.php'); [[ -z $chg ]] || phpcs-changed -s --git --git-unstaged $chg"
 		],
 		"lint-staged": [
-			"chg=$(git diff HEAD --relative --name-only -- '*.php'); [ -z $chg ] || phpcs-changed -s --git $chg"
+			"chg=$(git diff HEAD --relative --name-only -- '*.php'); [[ -z $chg ]] || phpcs-changed -s --git $chg"
+		],
+		"lint-branch": [
+			"sh ./bin/lint-branch.sh"
 		],
 		"phpcbf": [
 			"phpcbf -p"
diff --git a/plugins/woocommerce/composer.lock b/plugins/woocommerce/composer.lock
index d3bbd03fb77..8090f346bbb 100644
--- a/plugins/woocommerce/composer.lock
+++ b/plugins/woocommerce/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9b9f6dff1c579d1d1e86436b8e1fb6a7",
+    "content-hash": "f1ac527bc0de498e3c9e37bb255945c1",
     "packages": [
         {
             "name": "automattic/jetpack-autoloader",
@@ -628,16 +628,16 @@
         },
         {
             "name": "woocommerce/woocommerce-blocks",
-            "version": "10.0.2",
+            "version": "10.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woocommerce/woocommerce-blocks.git",
-                "reference": "d7275884591bc05f7e780c8cd7919d50b79b9ffa"
+                "reference": "7b5192d251e9c6f5502d2c8ab147498639f0eb84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-blocks/zipball/d7275884591bc05f7e780c8cd7919d50b79b9ffa",
-                "reference": "d7275884591bc05f7e780c8cd7919d50b79b9ffa",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-blocks/zipball/7b5192d251e9c6f5502d2c8ab147498639f0eb84",
+                "reference": "7b5192d251e9c6f5502d2c8ab147498639f0eb84",
                 "shasum": ""
             },
             "require": {
@@ -647,10 +647,10 @@
                 "ext-json": "*"
             },
             "require-dev": {
-                "mockery/mockery": "^1.4",
+                "mockery/mockery": "^1",
+                "phpunit/phpunit": "^8",
                 "woocommerce/woocommerce-sniffs": "0.1.3",
                 "wp-hooks/generator": "^0.9.0",
-                "wp-phpunit/wp-phpunit": "^6.0",
                 "yoast/phpunit-polyfills": "^1.0"
             },
             "type": "wordpress-plugin",
@@ -683,9 +683,9 @@
             ],
             "support": {
                 "issues": "https://github.com/woocommerce/woocommerce-blocks/issues",
-                "source": "https://github.com/woocommerce/woocommerce-blocks/tree/v10.0.2"
+                "source": "https://github.com/woocommerce/woocommerce-blocks/tree/v10.2.1"
             },
-            "time": "2023-04-19T08:04:13+00:00"
+            "time": "2023-05-25T12:56:45+00:00"
         }
     ],
     "packages-dev": [
diff --git a/plugins/woocommerce/i18n/states.php b/plugins/woocommerce/i18n/states.php
index d2cf0663755..c8f0a66e54d 100644
--- a/plugins/woocommerce/i18n/states.php
+++ b/plugins/woocommerce/i18n/states.php
@@ -603,6 +603,7 @@ return array(
 		'ZA' => __( 'Zamora', 'woocommerce' ),
 		'Z'  => __( 'Zaragoza', 'woocommerce' ),
 	),
+	'ET' => array(),
 	'FI' => array(),
 	'FR' => array(),
 	'GF' => array(),
@@ -1807,6 +1808,7 @@ return array(
 		'RSKM' => _x( 'Kosovo-Metohija', 'district', 'woocommerce' ),
 		'RSVO' => _x( 'Vojvodina', 'district', 'woocommerce' ),
 	),
+	'RW' => array(),
 	'SE' => array(),
 	'UA' => array( // Ukrainian oblasts. https://github.com/unicode-org/cldr/blob/release-42/common/subdivisions/en.xml#L5243.
 		'UA05' => __( 'Vinnychchyna', 'woocommerce' ),
diff --git a/plugins/woocommerce/includes/abstracts/abstract-wc-order.php b/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
index d52747df6a7..60ce5cbeea3 100644
--- a/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
+++ b/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
@@ -142,7 +142,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	/**
 	 * This method overwrites the base class's clone method to make it a no-op. In base class WC_Data, we are unsetting the meta_id to clone.
 	 * It seems like this was done to avoid conflicting the metadata when duplicating products. However, doing that does not seems necessary for orders.
-	 * In-fact, when we do that for orders, we lose the capability to clone orders with custom meta data by caching plugins. This is because, when we clone an order object for caching, it will clone the metadata without the ID. Unfortunately, when this cached object with nulled meta ID is retreived, WC_Data will consider it as a new meta and will insert it as a new meta-data causing duplicates.
+	 * In-fact, when we do that for orders, we lose the capability to clone orders with custom meta data by caching plugins. This is because, when we clone an order object for caching, it will clone the metadata without the ID. Unfortunately, when this cached object with nulled meta ID is retrieved, WC_Data will consider it as a new meta and will insert it as a new meta-data causing duplicates.
 	 *
 	 * Eventually, we should move away from overwriting the __clone method in base class itself, since it's easily possible to still duplicate the product without having to hook into the __clone method.
 	 *
@@ -818,6 +818,16 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	 * @param string $type Order item type. Default null.
 	 */
 	public function remove_order_items( $type = null ) {
+
+		/**
+		 * Trigger action before removing all order line items. Allows you to track order items.
+		 *
+		 * @param  WC_Order  $this  The current order object.
+		 * @param  string $type Order item type. Default null.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action( 'woocommerce_remove_order_items', $this, $type );
 		if ( ! empty( $type ) ) {
 			$this->data_store->delete_items( $this, $type );
 
@@ -830,6 +840,15 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 			$this->data_store->delete_items( $this );
 			$this->items = array();
 		}
+		/**
+		 * Trigger action after removing all order line items.
+		 *
+		 * @param  WC_Order  $this  The current order object.
+		 * @param  string $type Order item type. Default null.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action( 'woocommerce_removed_order_items', $this, $type );
 	}
 
 	/**
diff --git a/plugins/woocommerce/includes/abstracts/abstract-wc-product.php b/plugins/woocommerce/includes/abstracts/abstract-wc-product.php
index 69e4d1f46c6..16d87eac306 100644
--- a/plugins/woocommerce/includes/abstracts/abstract-wc-product.php
+++ b/plugins/woocommerce/includes/abstracts/abstract-wc-product.php
@@ -1110,7 +1110,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
 	 *     position - integer sort order.
 	 *     visible - If visible on frontend.
 	 *     variation - If used for variations.
-	 * Indexed by unqiue key to allow clearing old ones after a set.
+	 * Indexed by unique key to allow clearing old ones after a set.
 	 *
 	 * @since 3.0.0
 	 * @param array $raw_attributes Array of WC_Product_Attribute objects.
@@ -1932,6 +1932,23 @@ class WC_Product extends WC_Abstract_Legacy_Product {
 		return apply_filters( 'woocommerce_product_single_add_to_cart_text', __( 'Add to cart', 'woocommerce' ), $this );
 	}
 
+	/**
+	 * Get the aria-describedby description for the add to cart button.
+	 *
+	 * @return string
+	 */
+	public function add_to_cart_aria_describedby() {
+		/**
+		 * Filter the aria-describedby description for the add to cart button.
+		 *
+		 * @since 7.8.0
+		 *
+		 * @param string $var Text for the 'aria-describedby' attribute.
+		 * @param WC_Product $this Product object.
+		 */
+		return apply_filters( 'woocommerce_product_add_to_cart_aria_describedby', '', $this );
+	}
+
 	/**
 	 * Get the add to cart button text.
 	 *
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-addons.php b/plugins/woocommerce/includes/admin/class-wc-admin-addons.php
index 25dbc15936e..81e3a9f0b84 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-addons.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-addons.php
@@ -1119,7 +1119,7 @@ class WC_Admin_Addons {
 	/**
 	 * Install WooCommerce Payments from the Extensions screens.
 	 *
-	 * @param string $section Optional. Extenstions tab.
+	 * @param string $section Optional. Extensions tab.
 	 *
 	 * @return void
 	 */
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-assets.php b/plugins/woocommerce/includes/admin/class-wc-admin-assets.php
index 65e189494da..98896edfacd 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-assets.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-assets.php
@@ -227,7 +227,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
 						'gateway_toggle' => wp_create_nonce( 'woocommerce-toggle-payment-gateway-enabled' ),
 					),
 					'urls'                              => array(
-						'add_product'     => Features::is_enabled( 'new-product-management-experience' ) || Features::is_enabled( 'product-block-editor' ) ? esc_url_raw( admin_url( 'admin.php?page=wc-admin&path=/add-product' ) ) : null,
+						'add_product'     => Features::is_enabled( 'new-product-management-experience' ) || \Automattic\WooCommerce\Utilities\FeaturesUtil::feature_is_enabled( 'product_block_editor' ) ? esc_url_raw( admin_url( 'admin.php?page=wc-admin&path=/add-product' ) ) : null,
 						'import_products' => current_user_can( 'import' ) ? esc_url_raw( admin_url( 'edit.php?post_type=product&page=product_importer' ) ) : null,
 						'export_products' => current_user_can( 'export' ) ? esc_url_raw( admin_url( 'edit.php?post_type=product&page=product_exporter' ) ) : null,
 					),
@@ -374,7 +374,6 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
 					'i18n_delete_refund'                 => __( 'Are you sure you wish to delete this refund? This action cannot be undone.', 'woocommerce' ),
 					'i18n_delete_tax'                    => __( 'Are you sure you wish to delete this tax column? This action cannot be undone.', 'woocommerce' ),
 					'remove_item_meta'                   => __( 'Remove this item meta?', 'woocommerce' ),
-					'remove_attribute'                   => __( 'Remove this attribute?', 'woocommerce' ),
 					'name_label'                         => __( 'Name', 'woocommerce' ),
 					'remove_label'                       => __( 'Remove', 'woocommerce' ),
 					'click_to_toggle'                    => __( 'Click to toggle', 'woocommerce' ),
@@ -416,7 +415,6 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
 					'rounding_precision'                 => wc_get_rounding_precision(),
 					'tax_rounding_mode'                  => wc_get_tax_rounding_mode(),
 					'product_types'                      => array_unique( array_merge( array( 'simple', 'grouped', 'variable', 'external' ), array_keys( wc_get_product_types() ) ) ),
-					'has_local_attributes'               => ! empty( wc_get_attribute_taxonomies() ),
 					'i18n_download_permission_fail'      => __( 'Could not grant access - the user may already have permission for this file or billing email is not set. Ensure the billing email is set, and the order has been saved.', 'woocommerce' ),
 					'i18n_permission_revoke'             => __( 'Are you sure you want to revoke access to this download?', 'woocommerce' ),
 					'i18n_tax_rate_already_exists'       => __( 'You cannot add the same tax rate twice!', 'woocommerce' ),
@@ -435,6 +433,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
 					/* translators: %1$s: maximum file size */
 					'i18n_product_image_tip'             => sprintf( __( 'For best results, upload JPEG or PNG files that are 1000 by 1000 pixels or larger. Maximum upload file size: %1$s.', 'woocommerce' ) , size_format( wp_max_upload_size() ) ),
 					'i18n_remove_used_attribute_confirmation_message' => __( 'If you remove this attribute, customers will no longer be able to purchase some variations of this product.', 'woocommerce' ),
+					'i18n_add_attribute_error_notice'    => __( 'Adding new attribute failed.', 'woocommerce' ),
 				);
 
 				wp_localize_script( 'wc-admin-meta-boxes', 'woocommerce_admin_meta_boxes', $params );
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-menus.php b/plugins/woocommerce/includes/admin/class-wc-admin-menus.php
index 79d4eb44045..800de06ee8a 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-menus.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-menus.php
@@ -427,7 +427,7 @@ class WC_Admin_Menus {
 	 * Maybe add new management product experience.
 	 */
 	public function maybe_add_new_product_management_experience() {
-		if ( Features::is_enabled( 'new-product-management-experience' ) || Features::is_enabled( 'product-block-editor' ) ) {
+		if ( Features::is_enabled( 'new-product-management-experience' ) || \Automattic\WooCommerce\Utilities\FeaturesUtil::feature_is_enabled( 'product_block_editor' ) ) {
 			global $submenu;
 			if ( isset( $submenu['edit.php?post_type=product'][10] ) ) {
 				// Disable phpcs since we need to override submenu classes.
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-status.php b/plugins/woocommerce/includes/admin/class-wc-admin-status.php
index 6e92ff6e4ff..0be2542485e 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-status.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-status.php
@@ -362,7 +362,7 @@ class WC_Admin_Status {
 			<?php
 				echo esc_html(
 					sprintf(
-					// translators: Comma seperated list of missing tables.
+					// translators: Comma separated list of missing tables.
 						__( 'Missing base tables: %s. Some WooCommerce functionality may not work as expected.', 'woocommerce' ),
 						implode( ', ', $missing_tables )
 					)
diff --git a/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php b/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php
index 65e55285bdc..972ce762537 100644
--- a/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php
+++ b/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php
@@ -201,7 +201,7 @@ class WC_Helper_Updater {
 	}
 
 	/**
-	 * Get translations updates informations.
+	 * Get translations updates information.
 	 *
 	 * Scans through all subscriptions for the connected user, as well
 	 * as all Woo extensions without a subscription, and obtains update
@@ -226,7 +226,7 @@ class WC_Helper_Updater {
 		$locales = apply_filters( 'plugins_update_check_locales', $locales );
 		$locales = array_unique( $locales );
 
-		// No locales, the respone will be empty, we can return now.
+		// No locales, the response will be empty, we can return now.
 		if ( empty( $locales ) ) {
 			return array();
 		}
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php b/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
index 4a776a60a20..67312222375 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
@@ -186,14 +186,12 @@ class WC_Meta_Box_Product_Data {
 		global $post, $wpdb, $product_object;
 
 		/* phpcs:disable WooCommerce.Commenting.CommentHooks.MissingHookComment */
-		$global_attributes_count        = count( wc_get_attribute_taxonomies() );
-		$variation_attributes           = array_filter( $product_object->get_attributes(), array( __CLASS__, 'filter_variation_attributes' ) );
-		$non_variation_attributes_count = count( array_filter( $product_object->get_attributes(), array( __CLASS__, 'filter_non_variation_attributes' ) ) );
-		$default_attributes             = $product_object->get_default_attributes();
-		$variations_count               = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_count', $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'product_variation' AND post_status IN ('publish', 'private')", $post->ID ) ), $post->ID ) );
-		$variations_per_page            = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) );
-		$variations_total_pages         = ceil( $variations_count / $variations_per_page );
-		$modal_title                    = get_bloginfo( 'name' ) . __( ' says', 'woocommerce' );
+		$variation_attributes   = array_filter( $product_object->get_attributes(), array( __CLASS__, 'filter_variation_attributes' ) );
+		$default_attributes     = $product_object->get_default_attributes();
+		$variations_count       = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_count', $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'product_variation' AND post_status IN ('publish', 'private')", $post->ID ) ), $post->ID ) );
+		$variations_per_page    = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) );
+		$variations_total_pages = ceil( $variations_count / $variations_per_page );
+		$modal_title            = get_bloginfo( 'name' ) . __( ' says', 'woocommerce' );
 		/* phpcs: enable */
 
 		include __DIR__ . '/views/html-product-data-variations.php';
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php
index a757f0414e8..753dc99f84f 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php
@@ -13,78 +13,27 @@ global $wc_product_attributes;
 // Array of defined attribute taxonomies.
 $attribute_taxonomies = wc_get_attribute_taxonomies();
 // Product attributes - taxonomies and custom, ordered, with visibility and variation attributes set.
-$product_attributes              = $product_object->get_attributes( 'edit' );
-$has_local_attributes            = empty( $attribute_taxonomies );
-$has_global_attributes           = empty( $product_attributes );
-$is_add_global_attribute_visible = ! $has_local_attributes && $has_global_attributes;
-$icon_url                        = WC_ADMIN_IMAGES_FOLDER_URL . '/icons/global-attributes-icon.svg';
+$product_attributes = $product_object->get_attributes( 'edit' );
 ?>
 <div id="product_attributes" class="panel wc-metaboxes-wrapper hidden">
-	<div class="toolbar toolbar-top <?php echo $is_add_global_attribute_visible ? ' expand-close-hidden' : ''; ?>">
-		<div class="add-global-attribute-container<?php echo $is_add_global_attribute_visible ? '' : ' hidden'; ?>">
-			<div class="actions">
-				<button type="button" class="button add_custom_attribute"><?php esc_html_e( 'Add new', 'woocommerce' ); ?></button>
-				<select class="wc-attribute-search" data-placeholder="<?php esc_attr_e( 'Add existing', 'woocommerce' ); ?>" data-minimum-input-length="0">
-				</select>
-			</div>
-			<div class="message">
-				<img src="<?php echo esc_url( $icon_url ); ?>" />
-				<p>
-					<?php
-					esc_html_e(
-						'Add descriptive pieces of information that customers can use to search for this product on your store, such as “Material” or “Brand”.',
-						'woocommerce'
-					);
-					?>
-				</p>
-			</div>
-		</div>
-		<div class="add-attribute-container<?php echo $is_add_global_attribute_visible ? ' hidden' : ' '; ?>">
-			<?php
-			if ( $has_local_attributes && $has_global_attributes ) :
-				?>
-			<div id="message" class="inline notice woocommerce-message">
-				<p>
-					<?php
-					esc_html_e(
-						'Add descriptive pieces of information that customers can use to search for this product on your store, such as “Material” or “Brand”.',
-						'woocommerce'
-					);
-					?>
-				</p>
-			</div>
-			<?php endif; ?>
-			<span class="expand-close">
-				<a href="#" class="expand_all"><?php esc_html_e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php esc_html_e( 'Close', 'woocommerce' ); ?></a>
-			</span>
-
-			<?php
-			/**
-			 * Filter for the attribute taxonomy filter dropdown threshold.
-			 *
-			 * @since 7.0.0
-			 * @param number $threshold The threshold for showing the simple dropdown.
-			 */
-			if ( count( $attribute_taxonomies ) <= apply_filters( 'woocommerce_attribute_taxonomy_filter_threshold', 20 ) ) :
-				?>
-			<select name="attribute_taxonomy" class="attribute_taxonomy">
-				<option value=""><?php esc_html_e( 'Custom product attribute', 'woocommerce' ); ?></option>
+	<div class="toolbar toolbar-top">
+		<div id="message" class="inline notice woocommerce-message">
+			<p>
 				<?php
-				if ( ! $has_local_attributes ) {
-					foreach ( $attribute_taxonomies as $attr_taxonomy ) {
-						$attribute_taxonomy_name = wc_attribute_taxonomy_name( $attr_taxonomy->attribute_name );
-						$label                   = $attr_taxonomy->attribute_label ? $attr_taxonomy->attribute_label : $attr_taxonomy->attribute_name;
-						echo '<option value="' . esc_attr( $attribute_taxonomy_name ) . '">' . esc_html( $label ) . '</option>';
-					}
-				}
+				esc_html_e(
+					'Add descriptive pieces of information that customers can use to search for this product on your store, such as “Material” or “Brand”.',
+					'woocommerce'
+				);
 				?>
+			</p>
+		</div>
+		<span class="expand-close">
+			<a href="#" class="expand_all"><?php esc_html_e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php esc_html_e( 'Close', 'woocommerce' ); ?></a>
+		</span>
+		<div class="actions">
+			<button type="button" class="button add_custom_attribute"><?php esc_html_e( 'Add new', 'woocommerce' ); ?></button>
+			<select class="wc-attribute-search" data-placeholder="<?php esc_attr_e( 'Add existing', 'woocommerce' ); ?>" data-minimum-input-length="0">
 			</select>
-			<button type="button" class="button add_attribute"><?php esc_html_e( 'Add', 'woocommerce' ); ?></button>
-			<?php else : ?>
-			<button type="button" class="button add_custom_attribute"><?php esc_html_e( 'Add custom attribute', 'woocommerce' ); ?></button>
-			<select class="wc-attribute-search attribute_taxonomy" id="attribute_taxonomy" name="attribute_taxonomy" data-placeholder="<?php esc_attr_e( 'Add existing attribute', 'woocommerce' ); ?>" data-minimum-input-length="0">
-			</select>
-			<?php endif; ?>
 		</div>
 	</div>
 	<div class="product_attributes wc-metaboxes">
@@ -104,7 +53,7 @@ $icon_url                        = WC_ADMIN_IMAGES_FOLDER_URL . '/icons/global-a
 		}
 		?>
 	</div>
-	<div class="toolbar toolbar-buttons<?php echo $is_add_global_attribute_visible ? ' hidden' : ''; ?>">
+	<div class="toolbar toolbar-buttons">
 		<span class="expand-close">
 			<a href="#" class="expand_all"><?php esc_html_e( 'Expand', 'woocommerce' ); ?></a> / <a href="#" class="close_all"><?php esc_html_e( 'Close', 'woocommerce' ); ?></a>
 		</span>
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php
index c524f461e55..1e1d0f71a6e 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php
@@ -16,7 +16,7 @@ $arrow_img_url          = WC_ADMIN_IMAGES_FOLDER_URL . '/product_data/no-variati
 <div id="variable_product_options" class="panel wc-metaboxes-wrapper hidden">
 	<div id="variable_product_options_inner">
 
-		<?php if ( ! count( $variation_attributes ) && ( ( $global_attributes_count > 0 ) || ( $non_variation_attributes_count > 0 ) ) ) : ?>
+		<?php if ( ! count( $variation_attributes ) ) : ?>
 
 		<div class="add-attributes-container">
 			<div class="add-attributes-message">
@@ -36,27 +36,6 @@ $arrow_img_url          = WC_ADMIN_IMAGES_FOLDER_URL . '/product_data/no-variati
 			</div>
 		</div>
 
-		<?php elseif ( ! count( $variation_attributes ) ) : ?>
-
-		<div id="message" class="inline notice woocommerce-message">
-			<p>
-				<?php echo esc_html_e( 'Offer customers multiple product options, like size and color. Start by creating a new custom attribute and enter available values (they’ll be shown as selectable product options).', 'woocommerce' ); ?> <a target="_blank" href="https://woocommerce.com/document/variable-product/#add-variations"><?php esc_html_e( 'Learn more about creating variations', 'woocommerce' ); ?></a>
-			</p>
-		</div>
-		<div class="wc-metabox">
-			<div class="woocommerce_variation_new_attribute_data wc-metabox-content">
-			<?php
-				$i                    = 0;
-				$is_variations_screen = true;
-				$attribute            = new WC_Product_Attribute();
-				$attribute->set_variation( true );
-				require __DIR__ . '/html-product-attribute-inner.php';
-			?>
-				<div class="toolbar">
-					<button type="button" aria-disabled="true" class="button button-primary create-variations disabled"><?php esc_html_e( 'Create variations', 'woocommerce' ); ?></button>
-				</div>
-			</div>
-		</div>
 		<?php else : ?>
 
 			<div class="toolbar toolbar-variations-defaults">
diff --git a/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php b/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php
index 5fe4f46d5d8..bd76beab7d9 100644
--- a/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php
+++ b/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php
@@ -45,7 +45,7 @@ class WC_Settings_Products extends WC_Settings_Page {
 	}
 
 	/**
-	 * Get settings for the detault section.
+	 * Get settings for the default section.
 	 *
 	 * @return array
 	 */
diff --git a/plugins/woocommerce/includes/admin/views/html-admin-dashboard-setup.php b/plugins/woocommerce/includes/admin/views/html-admin-dashboard-setup.php
index aee8a61b5e5..f524c1d8367 100644
--- a/plugins/woocommerce/includes/admin/views/html-admin-dashboard-setup.php
+++ b/plugins/woocommerce/includes/admin/views/html-admin-dashboard-setup.php
@@ -35,7 +35,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 		const currentStep = widget.data( 'current-step' );
 		const totalSteps = widget.data( 'total-steps' );
 
-		$( document ).on( 'ready', function() {
+		$( function() {
 			window.wcTracks.recordEvent( 'wcadmin_setup_widget_view', {
 				completed_tasks: currentStep,
 				total_tasks: totalSteps,
diff --git a/plugins/woocommerce/includes/admin/views/html-notice-base-table-missing.php b/plugins/woocommerce/includes/admin/views/html-notice-base-table-missing.php
index 1a8859b122c..f2d8e687adc 100644
--- a/plugins/woocommerce/includes/admin/views/html-notice-base-table-missing.php
+++ b/plugins/woocommerce/includes/admin/views/html-notice-base-table-missing.php
@@ -23,7 +23,7 @@ defined( 'ABSPATH' ) || exit;
 		if ( $verify_db_tool_available ) {
 			echo wp_kses_post(
 				sprintf(
-				/* translators: %1%s: Missing tables (seperated by ",") %2$s: Link to check again */
+				/* translators: %1%s: Missing tables (separated by ",") %2$s: Link to check again */
 					__( 'One or more tables required for WooCommerce to function are missing, some features may not work as expected. Missing tables: %1$s. <a href="%2$s">Check again.</a>', 'woocommerce' ),
 					esc_html( implode( ', ', $missing_tables ) ),
 					wp_nonce_url( admin_url( 'admin.php?page=wc-status&tab=tools&action=verify_db_tables' ), 'debug_action' )
@@ -32,7 +32,7 @@ defined( 'ABSPATH' ) || exit;
 		} else {
 			echo wp_kses_post(
 				sprintf(
-				/* translators: %1%s: Missing tables (seperated by ",") */
+				/* translators: %1%s: Missing tables (separated by ",") */
 					__( 'One or more tables required for WooCommerce to function are missing, some features may not work as expected. Missing tables: %1$s.', 'woocommerce' ),
 					esc_html( implode( ', ', $missing_tables ) )
 				)
diff --git a/plugins/woocommerce/includes/class-wc-ajax.php b/plugins/woocommerce/includes/class-wc-ajax.php
index deb0961096b..b10a2986d90 100644
--- a/plugins/woocommerce/includes/class-wc-ajax.php
+++ b/plugins/woocommerce/includes/class-wc-ajax.php
@@ -196,6 +196,22 @@ class WC_AJAX {
 				}
 			);
 		}
+
+		// WP's heartbeat.
+		$ajax_heartbeat_callbacks = array(
+			'order_refresh_lock',
+			'check_locked_orders',
+		);
+		foreach ( $ajax_heartbeat_callbacks as $ajax_callback ) {
+			add_filter(
+				'heartbeat_received',
+				function( $response, $data ) use ( $ajax_callback ) {
+					return call_user_func_array( array( __CLASS__, $ajax_callback ), func_get_args() );
+				},
+				10,
+				2
+			);
+		}
 	}
 
 	/**
@@ -2994,9 +3010,28 @@ class WC_AJAX {
 				$zone = new WC_Shipping_Zone( $zone_data['zone_id'] );
 
 				if ( isset( $zone_data['zone_order'] ) ) {
+					/**
+					 * Notify that a non-option setting has been updated.
+					 *
+					 * @since 7.8.0
+					 */
+					do_action(
+						'woocommerce_update_non_option_setting',
+						array(
+							'id' => 'zone_order',
+						)
+					);
 					$zone->set_zone_order( $zone_data['zone_order'] );
 				}
 
+				global $current_tab;
+				$current_tab = 'shipping';
+				/**
+				 * Completes the saving process for options.
+				 *
+				 * @since 7.8.0
+				 */
+				do_action( 'woocommerce_update_options' );
 				$zone->save();
 			}
 		}
@@ -3028,10 +3063,30 @@ class WC_AJAX {
 			wp_die();
 		}
 
-		$zone_id     = wc_clean( wp_unslash( $_POST['zone_id'] ) );
-		$zone        = new WC_Shipping_Zone( $zone_id );
+		$zone_id = wc_clean( wp_unslash( $_POST['zone_id'] ) );
+		$zone    = new WC_Shipping_Zone( $zone_id );
+		/**
+		 * Notify that a non-option setting has been updated.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action(
+			'woocommerce_update_non_option_setting',
+			array(
+				'id' => 'zone_method',
+			)
+		);
 		$instance_id = $zone->add_shipping_method( wc_clean( wp_unslash( $_POST['method_id'] ) ) );
 
+		global $current_tab;
+		$current_tab = 'shipping';
+		/**
+		 * Completes the saving process for options.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action( 'woocommerce_update_options' );
+
 		wp_send_json_success(
 			array(
 				'instance_id' => $instance_id,
@@ -3068,10 +3123,22 @@ class WC_AJAX {
 		$changes = wp_unslash( $_POST['changes'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 
 		if ( isset( $changes['zone_name'] ) ) {
+			/**
+			 * Completes the saving process for options.
+			 *
+			 * @since 7.8.0
+			 */
+			do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'zone_name' ) );
 			$zone->set_zone_name( wc_clean( $changes['zone_name'] ) );
 		}
 
 		if ( isset( $changes['zone_locations'] ) ) {
+			/**
+			 * Completes the saving process for options.
+			 *
+			 * @since 7.8.0
+			 */
+			do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'zone_locations' ) );
 			$zone->clear_locations( array( 'state', 'country', 'continent' ) );
 			$locations = array_filter( array_map( 'wc_clean', (array) $changes['zone_locations'] ) );
 			foreach ( $locations as $location ) {
@@ -3092,6 +3159,12 @@ class WC_AJAX {
 		}
 
 		if ( isset( $changes['zone_postcodes'] ) ) {
+			/**
+			 * Completes the saving process for options.
+			 *
+			 * @since 7.8.0
+			 */
+			do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'zone_postcodes' ) );
 			$zone->clear_locations( 'postcode' );
 			$postcodes = array_filter( array_map( 'strtoupper', array_map( 'wc_clean', explode( "\n", $changes['zone_postcodes'] ) ) ) );
 			foreach ( $postcodes as $postcode ) {
@@ -3100,6 +3173,12 @@ class WC_AJAX {
 		}
 
 		if ( isset( $changes['methods'] ) ) {
+			/**
+			 * Completes the saving process for options.
+			 *
+			 * @since 7.8.0
+			 */
+			do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'zone_methods' ) );
 			foreach ( $changes['methods'] as $instance_id => $data ) {
 				$method_id = $wpdb->get_var( $wpdb->prepare( "SELECT method_id FROM {$wpdb->prefix}woocommerce_shipping_zone_methods WHERE instance_id = %d", $instance_id ) );
 
@@ -3122,10 +3201,22 @@ class WC_AJAX {
 				);
 
 				if ( isset( $method_data['method_order'] ) ) {
+					/**
+					 * Completes the saving process for options.
+					 *
+					 * @since 7.8.0
+					 */
+					do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'zone_methods_order' ) );
 					$wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'method_order' => absint( $method_data['method_order'] ) ), array( 'instance_id' => absint( $instance_id ) ) );
 				}
 
 				if ( isset( $method_data['enabled'] ) ) {
+					/**
+					 * Completes the saving process for options.
+					 *
+					 * @since 7.8.0
+					 */
+					do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'zone_methods_enabled' ) );
 					$is_enabled = absint( 'yes' === $method_data['enabled'] );
 					if ( $wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'is_enabled' => $is_enabled ), array( 'instance_id' => absint( $instance_id ) ) ) ) {
 						do_action( 'woocommerce_shipping_zone_method_status_toggled', $instance_id, $method_id, $zone_id, $is_enabled );
@@ -3136,6 +3227,15 @@ class WC_AJAX {
 
 		$zone->save();
 
+		global $current_tab;
+		$current_tab = 'shipping';
+		/**
+		 * Completes the saving process for options.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action( 'woocommerce_update_options' );
+
 		wp_send_json_success(
 			array(
 				'zone_id'   => $zone->get_id(),
@@ -3167,7 +3267,22 @@ class WC_AJAX {
 		$instance_id     = absint( $_POST['instance_id'] );
 		$zone            = WC_Shipping_Zones::get_zone_by( 'instance_id', $instance_id );
 		$shipping_method = WC_Shipping_Zones::get_shipping_method( $instance_id );
+		/**
+		 * Notify that a non-option setting has been updated.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'zone_method_settings' ) );
 		$shipping_method->set_post_data( wp_unslash( $_POST['data'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+
+		global $current_tab;
+		$current_tab = 'shipping';
+		/**
+		 * Completes the saving process for options.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action( 'woocommerce_update_options' );
 		$shipping_method->process_admin_options();
 
 		WC_Cache_Helper::get_transient_version( 'shipping', true );
@@ -3219,14 +3334,32 @@ class WC_AJAX {
 			$update_args = array();
 
 			if ( isset( $data['name'] ) ) {
+				/**
+				 * Notify that a non-option setting has been updated.
+				 *
+				 * @since 7.8.0
+				 */
+				do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'shipping_class_name' ) );
 				$update_args['name'] = wc_clean( $data['name'] );
 			}
 
 			if ( isset( $data['slug'] ) ) {
+				/**
+				 * Notify that a non-option setting has been updated.
+				 *
+				 * @since 7.8.0
+				 */
+				do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'shipping_class_slug' ) );
 				$update_args['slug'] = wc_clean( $data['slug'] );
 			}
 
 			if ( isset( $data['description'] ) ) {
+				/**
+				 * Notify that a non-option setting has been updated.
+				 *
+				 * @since 7.8.0
+				 */
+				do_action( 'woocommerce_update_non_option_setting', array( 'id' => 'shipping_class_description' ) );
 				$update_args['description'] = wc_clean( $data['description'] );
 			}
 
@@ -3244,6 +3377,15 @@ class WC_AJAX {
 			do_action( 'woocommerce_shipping_classes_save_class', $term_id, $data );
 		}
 
+		global $current_tab, $current_section;
+		$current_tab     = 'shipping';
+		$current_section = 'classes';
+		/**
+		 * Completes the saving process for options.
+		 *
+		 * @since 7.8.0
+		 */
+		do_action( 'woocommerce_update_options' );
 		$wc_shipping = WC_Shipping::instance();
 
 		wp_send_json_success(
@@ -3296,7 +3438,6 @@ class WC_AJAX {
 					// Disable the gateway.
 					$gateway->update_option( 'enabled', 'no' );
 				}
-
 				do_action( 'woocommerce_update_options' );
 				wp_send_json_success( ! wc_string_to_bool( $enabled ) );
 				wp_die();
@@ -3322,6 +3463,31 @@ class WC_AJAX {
 	private static function order_delete_meta() : void {
 		wc_get_container()->get( CustomMetaBox::class )->delete_meta_ajax();
 	}
+
+	/**
+	 * Hooked to 'heartbeat_received' on the edit order page to refresh the lock on an order being edited by the current user.
+	 *
+	 * @param array $response The heartbeat response to be sent.
+	 * @param array $data     Data sent through the heartbeat.
+	 * @return array Response to be sent.
+	 */
+	private static function order_refresh_lock( $response, $data ) : array {
+		return wc_get_container()->get( Automattic\WooCommerce\Internal\Admin\Orders\EditLock::class )->refresh_lock_ajax( $response, $data );
+	}
+
+	/**
+	 * Hooked to 'heartbeat_received' on the orders screen to refresh the locked status of orders in the list table.
+	 *
+	 * @since 7.8.0
+	 *
+	 * @param array $response The heartbeat response to be sent.
+	 * @param array $data     Data sent through the heartbeat.
+	 * @return array Response to be sent.
+	 */
+	private static function check_locked_orders( $response, $data ) : array {
+		return wc_get_container()->get( Automattic\WooCommerce\Internal\Admin\Orders\EditLock::class )->check_locked_orders_ajax( $response, $data );
+	}
+
 }
 
 WC_AJAX::init();
diff --git a/plugins/woocommerce/includes/class-wc-countries.php b/plugins/woocommerce/includes/class-wc-countries.php
index f4fa5ceab6e..5fac236ec1d 100644
--- a/plugins/woocommerce/includes/class-wc-countries.php
+++ b/plugins/woocommerce/includes/class-wc-countries.php
@@ -1024,6 +1024,12 @@ class WC_Countries {
 							'hidden'   => true,
 						),
 					),
+					'ET' => array(
+						'state' => array(
+							'required' => false,
+							'hidden'   => true,
+						),
+					),
 					'FI' => array(
 						'postcode' => array(
 							'priority' => 65,
@@ -1393,6 +1399,12 @@ class WC_Countries {
 							'required' => false,
 						),
 					),
+					'RW' => array(
+						'state' => array(
+							'required' => false,
+							'hidden'   => true,
+						),
+					),
 					'SG' => array(
 						'state' => array(
 							'required' => false,
@@ -1573,7 +1585,7 @@ class WC_Countries {
 			// Default Locale Can be filtered to override fields in get_address_fields(). Countries with no specific locale will use default.
 			$this->locale['default'] = apply_filters( 'woocommerce_get_country_locale_default', $this->get_default_address_fields() );
 
-			// Filter default AND shop base locales to allow overides via a single function. These will be used when changing countries on the checkout.
+			// Filter default AND shop base locales to allow overrides via a single function. These will be used when changing countries on the checkout.
 			if ( ! isset( $this->locale[ $this->get_base_country() ] ) ) {
 				$this->locale[ $this->get_base_country() ] = $this->locale['default'];
 			}
diff --git a/plugins/woocommerce/includes/class-wc-coupon.php b/plugins/woocommerce/includes/class-wc-coupon.php
index 646c7bf0159..48d8f75337f 100644
--- a/plugins/woocommerce/includes/class-wc-coupon.php
+++ b/plugins/woocommerce/includes/class-wc-coupon.php
@@ -698,7 +698,7 @@ class WC_Coupon extends WC_Legacy_Coupon {
 	 * Set the minimum spend amount.
 	 *
 	 * @since 3.0.0
-	 * @param float $amount Minium amount.
+	 * @param float $amount Minimum amount.
 	 */
 	public function set_minimum_amount( $amount ) {
 		$this->set_prop( 'minimum_amount', wc_format_decimal( $amount ) );
diff --git a/plugins/woocommerce/includes/class-wc-form-handler.php b/plugins/woocommerce/includes/class-wc-form-handler.php
index 3ec4872d871..21d5744ac11 100644
--- a/plugins/woocommerce/includes/class-wc-form-handler.php
+++ b/plugins/woocommerce/includes/class-wc-form-handler.php
@@ -929,10 +929,17 @@ class WC_Form_Handler {
 	 * @throws Exception On login error.
 	 */
 	public static function process_login() {
-		// The global form-login.php template used `_wpnonce` in template versions < 3.3.0.
-		$nonce_value = wc_get_var( $_REQUEST['woocommerce-login-nonce'], wc_get_var( $_REQUEST['_wpnonce'], '' ) ); // @codingStandardsIgnoreLine.
 
-		if ( isset( $_POST['login'], $_POST['username'], $_POST['password'] ) && wp_verify_nonce( $nonce_value, 'woocommerce-login' ) ) {
+		static $valid_nonce = null;
+
+		if ( null === $valid_nonce ) {
+			// The global form-login.php template used `_wpnonce` in template versions < 3.3.0.
+			$nonce_value = wc_get_var( $_REQUEST['woocommerce-login-nonce'], wc_get_var( $_REQUEST['_wpnonce'], '' ) ); // @codingStandardsIgnoreLine.
+
+			$valid_nonce = wp_verify_nonce( $nonce_value, 'woocommerce-login' );
+		}
+
+		if ( isset( $_POST['login'], $_POST['username'], $_POST['password'] ) && $valid_nonce ) {
 
 			try {
 				$creds = array(
@@ -961,7 +968,7 @@ class WC_Form_Handler {
 					}
 				}
 
-				// Perform the login.
+				// Peform the login.
 				$user = wp_signon( apply_filters( 'woocommerce_login_credentials', $creds ), is_ssl() );
 
 				if ( is_wp_error( $user ) ) {
@@ -976,7 +983,9 @@ class WC_Form_Handler {
 						$redirect = wc_get_page_permalink( 'myaccount' );
 					}
 
-					wp_redirect( wp_validate_redirect( apply_filters( 'woocommerce_login_redirect', remove_query_arg( 'wc_error', $redirect ), $user ), wc_get_page_permalink( 'myaccount' ) ) ); // phpcs:ignore
+					$redirect = remove_query_arg( array( 'wc_error', 'password-reset' ), $redirect );
+
+					wp_redirect( wp_validate_redirect( apply_filters( 'woocommerce_login_redirect', $redirect, $user ), wc_get_page_permalink( 'myaccount' ) ) ); // phpcs:ignore
 					exit;
 				}
 			} catch ( Exception $e ) {
diff --git a/plugins/woocommerce/includes/class-wc-frontend-scripts.php b/plugins/woocommerce/includes/class-wc-frontend-scripts.php
index 4ddbb076061..5eb6d1e5b3a 100644
--- a/plugins/woocommerce/includes/class-wc-frontend-scripts.php
+++ b/plugins/woocommerce/includes/class-wc-frontend-scripts.php
@@ -62,7 +62,7 @@ class WC_Frontend_Scripts {
 		 *
 		 * @since 2.1.0
 		 * @param array List of default WooCommerce styles.
-		 * @retrun array List of styles to enqueue.
+		 * @return array List of styles to enqueue.
 		 */
 		$styles = apply_filters(
 			'woocommerce_enqueue_styles',
@@ -430,7 +430,6 @@ class WC_Frontend_Scripts {
 
 		// Global frontend scripts.
 		self::enqueue_script( 'woocommerce' );
-		self::enqueue_script( 'wc-cart-fragments' );
 
 		// CSS Styles.
 		$enqueue_styles = self::get_styles();
diff --git a/plugins/woocommerce/includes/class-wc-install.php b/plugins/woocommerce/includes/class-wc-install.php
index 3e26e86a54d..0a6bf898267 100644
--- a/plugins/woocommerce/includes/class-wc-install.php
+++ b/plugins/woocommerce/includes/class-wc-install.php
@@ -894,10 +894,42 @@ class WC_Install {
 			);
 		}
 
-		foreach ( $obsolete_notes_names as $obsolete_notes_name ) {
-			$wpdb->delete( $wpdb->prefix . 'wc_admin_notes', array( 'name' => $obsolete_notes_name ) );
-			$wpdb->delete( $wpdb->prefix . 'wc_admin_note_actions', array( 'name' => $obsolete_notes_name ) );
+		$note_names_placeholder = substr( str_repeat( ',%s', count( $obsolete_notes_names ) ), 1 );
+
+		$note_ids = $wpdb->get_results(
+			// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare -- Ignored for allowing interpolation in the IN statement.
+			$wpdb->prepare(
+				"SELECT note_id FROM {$wpdb->prefix}wc_admin_notes WHERE name IN ( $note_names_placeholder )",
+				$obsolete_notes_names
+			),
+			ARRAY_N
+			// phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare.
+		);
+
+		if ( ! $note_ids ) {
+			return;
 		}
+
+		$note_ids             = array_column( $note_ids, 0 );
+		$note_ids_placeholder = substr( str_repeat( ',%d', count( $note_ids ) ), 1 );
+
+		$wpdb->query(
+			// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare -- Ignored for allowing interpolation in the IN statement.
+			$wpdb->prepare(
+				"DELETE FROM {$wpdb->prefix}wc_admin_notes WHERE note_id IN ( $note_ids_placeholder )",
+				$note_ids
+			)
+			// phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare.
+		);
+
+		$wpdb->query(
+			// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare -- Ignored for allowing interpolation in the IN statement.
+			$wpdb->prepare(
+				"DELETE FROM {$wpdb->prefix}wc_admin_note_actions WHERE note_id IN ( $note_ids_placeholder )",
+				$note_ids
+			)
+			// phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare.
+		);
 	}
 
 	/**
@@ -1515,7 +1547,9 @@ CREATE TABLE {$wpdb->prefix}wc_category_lookup (
 		$tables = self::get_tables();
 
 		foreach ( $tables as $table ) {
-			$wpdb->query( "DROP TABLE IF EXISTS {$table}" ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+			// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+			$wpdb->query( "DROP TABLE IF EXISTS {$table}" );
+			// phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 		}
 	}
 
@@ -1541,7 +1575,7 @@ CREATE TABLE {$wpdb->prefix}wc_category_lookup (
 		}
 
 		if ( ! isset( $wp_roles ) ) {
-			$wp_roles = new WP_Roles(); // @codingStandardsIgnoreLine
+			$wp_roles = new WP_Roles(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 		}
 
 		// Dummy gettext calls to get strings in the catalog.
@@ -1671,7 +1705,7 @@ CREATE TABLE {$wpdb->prefix}wc_category_lookup (
 		}
 
 		if ( ! isset( $wp_roles ) ) {
-			$wp_roles = new WP_Roles(); // @codingStandardsIgnoreLine
+			$wp_roles = new WP_Roles(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 		}
 
 		$capabilities = self::get_core_capabilities();
diff --git a/plugins/woocommerce/includes/class-wc-post-types.php b/plugins/woocommerce/includes/class-wc-post-types.php
index 03d0f5535ea..78aef856503 100644
--- a/plugins/woocommerce/includes/class-wc-post-types.php
+++ b/plugins/woocommerce/includes/class-wc-post-types.php
@@ -365,460 +365,6 @@ class WC_Post_Types {
 					'has_archive'         => $has_archive,
 					'show_in_nav_menus'   => true,
 					'show_in_rest'        => true,
-					'template'            => array(
-						array(
-							'woocommerce/product-tab',
-							array(
-								'id'    => 'general',
-								'title' => __( 'General', 'woocommerce' ),
-								'order' => 10,
-							),
-							array(
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Basic details', 'woocommerce' ),
-										'description' => __( 'This info will be displayed on the product page, category pages, social media, and search results.', 'woocommerce' ),
-										'icon'        => array(
-											'src' => plugins_url( '/assets/client/admin/product-editor/icons/section_basic.svg', WC_PLUGIN_FILE ),
-										),
-									),
-									array(
-										array(
-											'woocommerce/product-name-field',
-											array(
-												'name' => 'Product name',
-											),
-										),
-										array(
-											'woocommerce/product-summary-field',
-										),
-										array(
-											'core/columns',
-											array(),
-											array(
-												array(
-													'core/column',
-													array(
-														'templateLock' => 'all',
-													),
-													array(
-														array(
-															'woocommerce/product-pricing-field',
-															array(
-																'name'  => 'regular_price',
-																'label' => __( 'List price', 'woocommerce' ),
-																'help'  => __( 'Manage more settings in <PricingTab>Pricing.</PricingTab>', 'woocommerce' ),
-															),
-														),
-													),
-												),
-												array(
-													'core/column',
-													array(
-														'templateLock' => 'all',
-													),
-													array(
-														array(
-															'woocommerce/product-pricing-field',
-															array(
-																'name'  => 'sale_price',
-																'label' => __( 'Sale price', 'woocommerce' ),
-															),
-														),
-													),
-												),
-											),
-										),
-									),
-								),
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Description', 'woocommerce' ),
-										'description' => __( 'What makes this product unique? What are its most important features? Enrich the product page by adding rich content using blocks.', 'woocommerce' ),
-										'icon'        => array(
-											'src' => '<svg width="14" height="17" viewBox="0 0 14 17" fill="none" xmlns="http://www.w3.org/2000/svg"><line x1="9.91663" y1="16.5" x2="9.91663" y2="1.38889" stroke="#1E1E1E" stroke-width="1.5"/><line x1="5.47217" y1="16.5" x2="5.47217" y2="1.38889" stroke="#1E1E1E" stroke-width="1.5"/><line x1="13.3334" y1="1.25" x2="4.44448" y2="1.25" stroke="#1E1E1E" stroke-width="1.5"/><path d="M4.13889 5.38889V9.46C2.21109 9.10713 0.75 7.41864 0.75 5.38889C0.75 3.35914 2.21109 1.67065 4.13889 1.31778V5.38889Z" fill="#1E1E1E" stroke="#1E1E1E" stroke-width="1.5"/></svg>',
-										),
-									),
-									array(
-										array(
-											'woocommerce/product-description-field',
-										),
-									),
-								),
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Images', 'woocommerce' ),
-										'description' => sprintf(
-											/* translators: %1$s: Images guide link opening tag. %2$s: Images guide link closing tag.*/
-											__( 'Drag images, upload new ones or select files from your library. For best results, use JPEG files that are 1000 by 1000 pixels or larger. %1$sHow to prepare images?%2$s', 'woocommerce' ),
-											'<a href="http://woocommerce.com/#" target="_blank" rel="noreferrer">',
-											'</a>'
-										),
-										'icon'        => array(
-											'src' => plugins_url( '/assets/client/admin/product-editor/icons/section_images.svg', WC_PLUGIN_FILE ),
-										),
-									),
-									array(
-										array(
-											'woocommerce/product-images-field',
-											array(
-												'images' => array(),
-											),
-										),
-									),
-								),
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Organization & visibility', 'woocommerce' ),
-										'description' => __( 'Help customers find this product by assigning it to categories or featuring it across your sales channels.', 'woocommerce' ),
-									),
-									array(
-										array(
-											'woocommerce/product-category-field',
-											array(
-												'name' => 'categories',
-											),
-										),
-									),
-								),
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Attributes', 'woocommerce' ),
-										'description' => sprintf(
-											/* translators: %1$s: Attributes guide link opening tag. %2$s: Attributes guide link closing tag.*/
-											__( 'Add descriptive pieces of information that customers can use to filter and search for this product. %1$sLearn more%2$s', 'woocommerce' ),
-											'<a href="https://woocommerce.com/document/managing-product-taxonomies/#product-attributes" target="_blank" rel="noreferrer">',
-											'</a>'
-										),
-										'icon'        => array(
-											'src' => plugins_url( '/assets/client/admin/product-editor/icons/section_attributes.svg', WC_PLUGIN_FILE ),
-										),
-									),
-									array(
-										array(
-											'woocommerce/product-attributes-field',
-										),
-									),
-								),
-							),
-						),
-						array(
-							'woocommerce/product-tab',
-							array(
-								'id'    => 'pricing',
-								'title' => __( 'Pricing', 'woocommerce' ),
-								'order' => 20,
-							),
-							array(
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Pricing', 'woocommerce' ),
-										'description' => sprintf(
-											/* translators: %1$s: Images guide link opening tag. %2$s: Images guide link closing tag.*/
-											__( 'Set a competitive price, put the product on sale, and manage tax calculations. %1$sHow to price your product?%2$s', 'woocommerce' ),
-											'<a href="https://woocommerce.com/posts/how-to-price-products-strategies-expert-tips/" target="_blank" rel="noreferrer">',
-											'</a>'
-										),
-										'icon'        => array(
-											'src' => plugins_url( '/assets/client/admin/product-editor/icons/section_pricing.svg', WC_PLUGIN_FILE ),
-										),
-									),
-									array(
-										array(
-											'core/columns',
-											array(),
-											array(
-												array(
-													'core/column',
-													array(
-														'templateLock' => 'all',
-													),
-													array(
-														array(
-															'woocommerce/product-pricing-field',
-															array(
-																'name'  => 'regular_price',
-																'label' => __( 'List price', 'woocommerce' ),
-															),
-														),
-													),
-												),
-												array(
-													'core/column',
-													array(
-														'templateLock' => 'all',
-													),
-													array(
-														array(
-															'woocommerce/product-pricing-field',
-															array(
-																'name'  => 'sale_price',
-																'label' => __( 'Sale price', 'woocommerce' ),
-															),
-														),
-													),
-												),
-											),
-										),
-										array(
-											'woocommerce/product-schedule-sale-fields',
-										),
-										array(
-											'woocommerce/product-radio-field',
-											array(
-												'title'    => __( 'Charge sales tax on', 'woocommerce' ),
-												'property' => 'tax_status',
-												'options'  => array(
-													array(
-														'label' => __( 'Product and shipping', 'woocommerce' ),
-														'value' => 'taxable',
-													),
-													array(
-														'label' => __( 'Only shipping', 'woocommerce' ),
-														'value' => 'shipping',
-													),
-													array(
-														'label' => __( "Don't charge tax", 'woocommerce' ),
-														'value' => 'none',
-													),
-												),
-											),
-										),
-										array(
-											'woocommerce/product-collapsible',
-											array(
-												'toggleText'       => __( 'Advanced', 'woocommerce' ),
-												'initialCollapsed' => true,
-												'persistRender'    => true,
-											),
-											array(
-												array(
-													'woocommerce/product-radio-field',
-													array(
-														'title'    => __( 'Tax class', 'woocommerce' ),
-														'description' => sprintf(
-															/* translators: %1$s: Learn more link opening tag. %2$s: Learn more link closing tag.*/
-															__( 'Apply a tax rate if this product qualifies for tax reduction or exemption. %1$sLearn more%2$s.', 'woocommerce' ),
-															'<a href="https://woocommerce.com/document/setting-up-taxes-in-woocommerce/#shipping-tax-class" target="_blank" rel="noreferrer">',
-															'</a>'
-														),
-														'property' => 'tax_class',
-														'options'  => array(
-															array(
-																'label' => __( 'Standard', 'woocommerce' ),
-																'value' => '',
-															),
-															array(
-																'label' => __( 'Reduced rate', 'woocommerce' ),
-																'value' => 'reduced-rate',
-															),
-															array(
-																'label' => __( 'Zero rate', 'woocommerce' ),
-																'value' => 'zero-rate',
-															),
-														),
-													),
-												),
-											),
-										),
-									),
-								),
-							),
-						),
-						array(
-							'woocommerce/product-tab',
-							array(
-								'id'    => 'inventory',
-								'title' => __( 'Inventory', 'woocommerce' ),
-								'order' => 30,
-							),
-							array(
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Inventory', 'woocommerce' ),
-										'description' => sprintf(
-											/* translators: %1$s: Inventory settings link opening tag. %2$s: Inventory settings link closing tag.*/
-											__( 'Set up and manage inventory for this product, including status and available quantity. %1$sManage store inventory settings%2$s', 'woocommerce' ),
-											'<a href="' . admin_url( 'admin.php?page=wc-settings&tab=products&section=inventory' ) . '" target="_blank" rel="noreferrer">',
-											'</a>'
-										),
-										'icon'        => array(
-											'src' => plugins_url( '/assets/client/admin/product-editor/icons/section_inventory.svg', WC_PLUGIN_FILE ),
-										),
-									),
-									array(
-										array(
-											'woocommerce/product-sku-field',
-										),
-										array(
-											'woocommerce/product-toggle-field',
-											array(
-												'label'    => __( 'Track stock quantity for this product', 'woocommerce' ),
-												'property' => 'manage_stock',
-												'disabled' => 'yes' !== get_option( 'woocommerce_manage_stock' ),
-											),
-										),
-										array(
-											'woocommerce/conditional',
-											array(
-												'mustMatch' => array(
-													'manage_stock' => array( true ),
-												),
-											),
-											array(
-												array(
-													'woocommerce/product-inventory-quantity-field',
-												),
-											),
-										),
-										array(
-											'woocommerce/conditional',
-											array(
-												'mustMatch' => array(
-													'manage_stock' => array( false ),
-												),
-											),
-											array(
-												array(
-													'woocommerce/product-radio-field',
-													array(
-														'title'    => __( 'Stock status', 'woocommerce' ),
-														'property' => 'stock_status',
-														'options'  => array(
-															array(
-																'label' => __( 'In stock', 'woocommerce' ),
-																'value' => 'instock',
-															),
-															array(
-																'label' => __( 'Out of stock', 'woocommerce' ),
-																'value' => 'outofstock',
-															),
-															array(
-																'label' => __( 'On backorder', 'woocommerce' ),
-																'value' => 'onbackorder',
-															),
-														),
-													),
-												),
-											),
-										),
-										array(
-											'woocommerce/product-collapsible',
-											array(
-												'toggleText'       => __( 'Advanced', 'woocommerce' ),
-												'initialCollapsed' => true,
-												'persistRender'    => true,
-											),
-											array(
-												array(
-													'woocommerce/conditional',
-													array(
-														'mustMatch' => array(
-															'manage_stock' => array( true ),
-														),
-													),
-													array(
-														array(
-															'woocommerce/product-radio-field',
-															array(
-																'title'    => __( 'When out of stock', 'woocommerce' ),
-																'property' => 'backorders',
-																'options'  => array(
-																	array(
-																		'label' => __( 'Allow purchases', 'woocommerce' ),
-																		'value' => 'yes',
-																	),
-																	array(
-																		'label' => __(
-																			'Allow purchases, but notify customers',
-																			'woocommerce'
-																		),
-																		'value' => 'notify',
-																	),
-																	array(
-																		'label' => __( "Don't allow purchases", 'woocommerce' ),
-																		'value' => 'no',
-																	),
-																),
-															),
-														),
-														array(
-															'woocommerce/product-inventory-email-field',
-														),
-													),
-												),
-												array(
-													'woocommerce/product-checkbox-field',
-													array(
-														'title'    => __(
-															'Restrictions',
-															'woocommerce'
-														),
-														'label'    => __(
-															'Limit purchases to 1 item per order',
-															'woocommerce'
-														),
-														'property' => 'sold_individually',
-														'tooltip' => __(
-															'When checked, customers will be able to purchase only 1 item in a single order. This is particularly useful for items that have limited quantity, like art or handmade goods.',
-															'woocommerce'
-														),
-													),
-												),
-
-											),
-										),
-
-									),
-								),
-							),
-
-						),
-						array(
-							'woocommerce/product-tab',
-							array(
-								'id'    => 'shipping',
-								'title' => __( 'Shipping', 'woocommerce' ),
-								'order' => 40,
-							),
-							array(
-								array(
-									'woocommerce/product-section',
-									array(
-										'title'       => __( 'Fees & dimensions', 'woocommerce' ),
-										'description' => sprintf(
-											/* translators: %1$s: How to get started? link opening tag. %2$s: How to get started? link closing tag.*/
-											__( 'Set up shipping costs and enter dimensions used for accurate rate calculations. %1$sHow to get started?%2$s.', 'woocommerce' ),
-											'<a href="https://woocommerce.com/posts/how-to-calculate-shipping-costs-for-your-woocommerce-store/" target="_blank" rel="noreferrer">',
-											'</a>'
-										),
-										'icon'        => array(
-											'src' => plugins_url( '/assets/client/admin/product-editor/icons/section_shipping.svg', WC_PLUGIN_FILE ),
-										),
-									),
-									array(
-										array(
-											'woocommerce/product-shipping-fee-fields',
-											array(
-												'title' => __( 'Shipping fee', 'woocommerce' ),
-											),
-										),
-										array(
-											'woocommerce/product-shipping-dimensions-fields',
-										),
-									),
-								),
-							),
-						),
-					),
-					'template_lock'       => 'all',
 				)
 			)
 		);
diff --git a/plugins/woocommerce/includes/class-wc-product-variable.php b/plugins/woocommerce/includes/class-wc-product-variable.php
index a240c406a08..ecab09b4cd3 100644
--- a/plugins/woocommerce/includes/class-wc-product-variable.php
+++ b/plugins/woocommerce/includes/class-wc-product-variable.php
@@ -51,6 +51,20 @@ class WC_Product_Variable extends WC_Product {
 	|--------------------------------------------------------------------------
 	*/
 
+	/**
+	 * Get the aria-describedby description for the add to cart button.
+	 *
+	 * @return string
+	 */
+	public function add_to_cart_aria_describedby() {
+		/**
+		 * This filter is documented in includes/abstracts/abstract-wc-product.php.
+		 *
+		 * @since 7.8.0
+		 */
+		return apply_filters( 'woocommerce_product_add_to_cart_aria_describedby', $this->is_purchasable() ? __( 'This product has multiple variants. The options may be chosen on the product page', 'woocommerce' ) : '', $this );
+	}
+
 	/**
 	 * Get the add to cart button text.
 	 *
diff --git a/plugins/woocommerce/includes/class-wc-query.php b/plugins/woocommerce/includes/class-wc-query.php
index 82d190e0ce8..fc7a9ec95a5 100644
--- a/plugins/woocommerce/includes/class-wc-query.php
+++ b/plugins/woocommerce/includes/class-wc-query.php
@@ -538,7 +538,7 @@ class WC_Query {
 		// Store reference to this query.
 		self::$product_query = $q;
 
-		// Additonal hooks to change WP Query.
+		// Additional hooks to change WP Query.
 		self::add_filter( 'posts_clauses', array( $this, 'product_query_post_clauses' ), 10, 2 );
 		add_filter( 'the_posts', array( $this, 'handle_get_posts' ), 10, 2 );
 
diff --git a/plugins/woocommerce/includes/class-wc-regenerate-images.php b/plugins/woocommerce/includes/class-wc-regenerate-images.php
index ca59231e7fb..35f8cde9b2e 100644
--- a/plugins/woocommerce/includes/class-wc-regenerate-images.php
+++ b/plugins/woocommerce/includes/class-wc-regenerate-images.php
@@ -51,7 +51,7 @@ class WC_Regenerate_Images {
 			add_action( 'admin_init', array( __CLASS__, 'regenerating_notice' ) );
 			add_action( 'woocommerce_hide_regenerating_thumbnails_notice', array( __CLASS__, 'dismiss_regenerating_notice' ) );
 
-			// Regenerate thumbnails in the background after settings changes. Not ran on multisite to avoid multiple simultanious jobs.
+			// Regenerate thumbnails in the background after settings changes. Not ran on multisite to avoid multiple simultaneous jobs.
 			if ( ! is_multisite() ) {
 				add_action( 'customize_save_after', array( __CLASS__, 'maybe_regenerate_images' ) );
 				add_action( 'after_switch_theme', array( __CLASS__, 'maybe_regenerate_images' ) );
diff --git a/plugins/woocommerce/includes/class-wc-tracker.php b/plugins/woocommerce/includes/class-wc-tracker.php
index 85320deae96..ad276b43431 100644
--- a/plugins/woocommerce/includes/class-wc-tracker.php
+++ b/plugins/woocommerce/includes/class-wc-tracker.php
@@ -419,7 +419,7 @@ class WC_Tracker {
 				SUM( order_meta.meta_value ) AS 'gross_total'
 			FROM {$wpdb->prefix}posts AS orders
 			LEFT JOIN {$wpdb->prefix}postmeta AS order_meta ON order_meta.post_id = orders.ID
-			WHERE order_meta.meta_key =  '_order_total'
+			WHERE order_meta.meta_key = '_order_total'
 				AND orders.post_status in ( 'wc-completed', 'wc-refunded' )
 			GROUP BY order_meta.meta_key
 		"
@@ -435,7 +435,7 @@ class WC_Tracker {
 				SUM( order_meta.meta_value ) AS 'gross_total'
 			FROM {$wpdb->prefix}posts AS orders
 			LEFT JOIN {$wpdb->prefix}postmeta AS order_meta ON order_meta.post_id = orders.ID
-			WHERE order_meta.meta_key =  '_order_total'
+			WHERE order_meta.meta_key = '_order_total'
 				AND orders.post_status = 'wc-processing'
 			GROUP BY order_meta.meta_key
 		"
@@ -498,6 +498,69 @@ class WC_Tracker {
 		return array_merge( $min_max, $processing_min_max );
 	}
 
+	/**
+	 * Extract the group key for an associative array of objects which have unique ids in the key.
+	 * A 'group_key' property is introduced in the object.
+	 * For example, two objects with keys like 'WooDataPay ** #123' and 'WooDataPay ** #78' would
+	 * both have a group_key of 'WooDataPay **' after this function call.
+	 *
+	 * @param array  $objects     The array of objects that need to be grouped.
+	 * @param string $default_key The property that will be the default group_key.
+	 * @return array Contains the objects with a group_key property.
+	 */
+	private static function extract_group_key( $objects, $default_key ) {
+		$keys = array_keys( $objects );
+
+		// Sort keys by length and then by characters within the same length keys.
+		usort(
+			$keys,
+			function( $a, $b ) {
+				if ( strlen( $a ) === strlen( $b ) ) {
+					return strcmp( $a, $b );
+				}
+				return ( strlen( $a ) < strlen( $b ) ) ? -1 : 1;
+			}
+		);
+
+		// Look for common tokens in every pair of adjacent keys.
+		$prev = '';
+		foreach ( $keys as $key ) {
+			if ( $prev ) {
+				$comm_tokens = array();
+
+				// Tokenize the current and previous gateway names.
+				$curr_tokens = preg_split( '/[ :,\-_]+/', $key );
+				$prev_tokens = preg_split( '/[ :,\-_]+/', $prev );
+
+				$len_curr = count( $curr_tokens );
+				$len_prev = count( $prev_tokens );
+
+				$index_unique = -1;
+				// Gather the common tokens.
+				// Let us allow for the unique reference id to be anywhere in the name.
+				for ( $i = 0; $i < $len_curr && $i < $len_prev; $i++ ) {
+					if ( $curr_tokens[ $i ] === $prev_tokens[ $i ] ) {
+						$comm_tokens[] = $curr_tokens[ $i ];
+					} elseif ( preg_match( '/\d/', $curr_tokens[ $i ] ) && preg_match( '/\d/', $prev_tokens[ $i ] ) ) {
+						$index_unique = $i;
+					}
+				}
+
+				// If only one token is different, and those tokens contain digits, then that could be the unique id.
+				if ( count( $curr_tokens ) - count( $comm_tokens ) <= 1 && count( $comm_tokens ) > 0 && $index_unique > -1 ) {
+					$objects[ $key ]->group_key  = implode( ' ', $comm_tokens );
+					$objects[ $prev ]->group_key = implode( ' ', $comm_tokens );
+				} else {
+					$objects[ $key ]->group_key = $objects[ $key ]->$default_key;
+				}
+			} else {
+				$objects[ $key ]->group_key = $objects[ $key ]->$default_key;
+			}
+			$prev = $key;
+		}
+		return $objects;
+	}
+
 	/**
 	 * Get order details by gateway.
 	 *
@@ -506,7 +569,7 @@ class WC_Tracker {
 	private static function get_orders_by_gateway() {
 		global $wpdb;
 
-		$orders_by_gateway = $wpdb->get_results(
+		$orders_and_gateway_details = $wpdb->get_results(
 			"
 			SELECT
 				gateway, currency, SUM(total) AS totals, COUNT(order_id) AS counts
@@ -530,14 +593,56 @@ class WC_Tracker {
 		);
 
 		$orders_by_gateway_currency = array();
-		foreach ( $orders_by_gateway as $orders_details ) {
-			$gateway  = 'gateway_' . $orders_details->gateway;
-			$currency = $orders_details->currency;
-			$count    = $gateway . '_' . $currency . '_count';
-			$total    = $gateway . '_' . $currency . '_total';
 
-			$orders_by_gateway_currency[ $count ] = $orders_details->counts;
-			$orders_by_gateway_currency[ $total ] = $orders_details->totals;
+		// The associative array that is created as the result of array_reduce is passed to extract_group_key()
+		// This function has the logic that will remove specific transaction identifiers that may sometimes be part of a
+		// payment method. For example, two payments methods like 'WooDataPay ** #123' and 'WooDataPay ** #78' would
+		// both have the same group_key 'WooDataPay **'.
+		$orders_by_gateway = self::extract_group_key(
+			// Convert into an associative array with a combination of currency and gateway as key.
+			array_reduce(
+				$orders_and_gateway_details,
+				function( $result, $item ) {
+					$item->gateway = preg_replace( '/\s+/', ' ', $item->gateway );
+
+					// Introduce currency as a prefix for the key.
+					$key = $item->currency . '==' . $item->gateway;
+
+					$result[ $key ] = $item;
+					return $result;
+				},
+				array()
+			),
+			'gateway'
+		);
+
+		// Aggregate using group_key.
+		foreach ( $orders_by_gateway as $orders_details ) {
+			$gkey = $orders_details->group_key;
+
+			// Remove currency as prefix of key for backward compatibility.
+			if ( str_contains( $gkey, '==' ) ) {
+				$tokens = preg_split( '/==/', $gkey );
+				$key    = $tokens[1];
+			} else {
+				$key = $gkey;
+			}
+
+			$key = str_replace( array( 'payment method', 'payment gateway', 'gateway' ), '', strtolower( $key ) );
+			$key = trim( preg_replace( '/[: ,#*\-_]+/', ' ', $key ) );
+
+			// Add currency as postfix of gateway for backward compatibility.
+			$key       = 'gateway_' . $key . '_' . $orders_details->currency;
+			$count_key = $key . '_count';
+			$total_key = $key . '_total';
+
+			if ( array_key_exists( $count_key, $orders_by_gateway_currency ) || array_key_exists( $total_key, $orders_by_gateway_currency ) ) {
+				$orders_by_gateway_currency[ $count_key ] = $orders_by_gateway_currency[ $count_key ] + $orders_details->counts;
+				$orders_by_gateway_currency[ $total_key ] = $orders_by_gateway_currency[ $total_key ] + $orders_details->totals;
+			} else {
+				$orders_by_gateway_currency[ $count_key ] = $orders_details->counts;
+				$orders_by_gateway_currency[ $total_key ] = $orders_details->totals;
+			}
 		}
 
 		return $orders_by_gateway_currency;
@@ -566,9 +671,35 @@ class WC_Tracker {
 			"
 		);
 
+		// The associative array that is created as the result of array_reduce is passed to extract_group_key()
+		// This function has the logic that will remove specific identifiers that may sometimes be part of an origin.
+		// For example, two origins like 'Import #123' and 'Import ** #78' would both have a group_key 'Import **'.
+		$orders_and_origins = self::extract_group_key(
+			// Convert into an associative array with the origin as key.
+			array_reduce(
+				$orders_origin,
+				function( $result, $item ) {
+					$key = $item->origin;
+
+					$result[ $key ] = $item;
+					return $result;
+				},
+				array()
+			),
+			'origin'
+		);
+
 		$orders_by_origin = array();
-		foreach ( $orders_origin as $origin ) {
-			$orders_by_origin[ $origin->origin ] = (int) $origin->count;
+
+		// Aggregate using group_key.
+		foreach ( $orders_and_origins as $origin ) {
+			$key = strtolower( $origin->group_key );
+
+			if ( array_key_exists( $key, $orders_by_origin ) ) {
+				$orders_by_origin[ $key ] = $orders_by_origin[ $key ] + (int) $origin->count;
+			} else {
+				$orders_by_origin[ $key ] = (int) $origin->count;
+			}
 		}
 
 		return array( 'created_via' => $orders_by_origin );
diff --git a/plugins/woocommerce/includes/class-woocommerce.php b/plugins/woocommerce/includes/class-woocommerce.php
index 5b83720053b..f9427ef3f49 100644
--- a/plugins/woocommerce/includes/class-woocommerce.php
+++ b/plugins/woocommerce/includes/class-woocommerce.php
@@ -18,6 +18,7 @@ use Automattic\WooCommerce\Internal\ProductAttributesLookup\LookupDataStore;
 use Automattic\WooCommerce\Internal\ProductDownloads\ApprovedDirectories\Register as ProductDownloadDirectories;
 use Automattic\WooCommerce\Internal\RestockRefundedItemsAdjuster;
 use Automattic\WooCommerce\Internal\Settings\OptionSanitizer;
+use Automattic\WooCommerce\Internal\Utilities\WebhookUtil;
 use Automattic\WooCommerce\Proxies\LegacyProxy;
 
 /**
@@ -32,7 +33,7 @@ final class WooCommerce {
 	 *
 	 * @var string
 	 */
-	public $version = '7.8.0';
+	public $version = '7.9.0';
 
 	/**
 	 * WooCommerce Schema version.
@@ -240,6 +241,7 @@ final class WooCommerce {
 		$container->get( OptionSanitizer::class );
 		$container->get( BatchProcessingController::class );
 		$container->get( FeaturesController::class );
+		$container->get( WebhookUtil::class );
 	}
 
 	/**
diff --git a/plugins/woocommerce/includes/data-stores/abstract-wc-order-data-store-cpt.php b/plugins/woocommerce/includes/data-stores/abstract-wc-order-data-store-cpt.php
index c35fd5b594e..f86eaeef6a6 100644
--- a/plugins/woocommerce/includes/data-stores/abstract-wc-order-data-store-cpt.php
+++ b/plugins/woocommerce/includes/data-stores/abstract-wc-order-data-store-cpt.php
@@ -616,7 +616,7 @@ abstract class Abstract_WC_Order_Data_Store_CPT extends WC_Data_Store_WP impleme
 	}
 
 	/**
-	 * Helper method to update order metadata from intialized order object.
+	 * Helper method to update order metadata from initialized order object.
 	 *
 	 * @param WC_Abstract_Order $order Order object.
 	 */
diff --git a/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php b/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php
index 6e780300bd4..8eb78696f6e 100644
--- a/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php
+++ b/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php
@@ -1137,7 +1137,7 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
 		/**
 		 * Check each variation to find the one that matches the $match_attributes.
 		 *
-		 * Note: Not all meta fields will be set which is why we check existance.
+		 * Note: Not all meta fields will be set which is why we check existence.
 		 */
 		foreach ( $sorted_meta as $variation_id => $variation ) {
 			$match = true;
diff --git a/plugins/woocommerce/includes/data-stores/class-wc-webhook-data-store.php b/plugins/woocommerce/includes/data-stores/class-wc-webhook-data-store.php
index e8b417e3a8f..adb0f36be22 100644
--- a/plugins/woocommerce/includes/data-stores/class-wc-webhook-data-store.php
+++ b/plugins/woocommerce/includes/data-stores/class-wc-webhook-data-store.php
@@ -282,6 +282,7 @@ class WC_Webhook_Data_Store implements WC_Webhook_Data_Store_Interface {
 		$exclude         = '';
 		$date_created    = '';
 		$date_modified   = '';
+		$user_id         = '';
 
 		if ( ! empty( $args['include'] ) ) {
 			$args['include'] = implode( ',', wp_parse_id_list( $args['include'] ) );
@@ -293,6 +294,10 @@ class WC_Webhook_Data_Store implements WC_Webhook_Data_Store_Interface {
 			$exclude         = 'AND webhook_id NOT IN (' . $args['exclude'] . ')';
 		}
 
+		if ( ! empty( $args['user_id'] ) ) {
+			$user_id = $wpdb->prepare( 'AND `user_id` = %d', absint( $args['user_id'] ) );
+		}
+
 		if ( ! empty( $args['after'] ) || ! empty( $args['before'] ) ) {
 			$args['after']  = empty( $args['after'] ) ? '0000-00-00' : $args['after'];
 			$args['before'] = empty( $args['before'] ) ? current_time( 'mysql', 1 ) : $args['before'];
@@ -326,6 +331,7 @@ class WC_Webhook_Data_Store implements WC_Webhook_Data_Store_Interface {
 				{$exclude}
 				{$date_created}
 				{$date_modified}
+				{$user_id}
 				{$order}
 				{$limit}
 				{$offset}"
@@ -349,6 +355,7 @@ class WC_Webhook_Data_Store implements WC_Webhook_Data_Store_Interface {
 				{$exclude}
 				{$date_created}
 				{$date_modified}
+				{$user_id}
 				{$order}
 				{$limit}
 				{$offset}"
diff --git a/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php b/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php
index a59c6f5ea8c..1c0b976dddf 100644
--- a/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php
+++ b/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php
@@ -182,7 +182,7 @@ class WC_Product_CSV_Exporter extends WC_CSV_Batch_Exporter {
 		$variable_products = array();
 
 		foreach ( $products->products as $product ) {
-			// Check if the category is set, this means we need to fetch variations seperately as they are not tied to a category.
+			// Check if the category is set, this means we need to fetch variations separately as they are not tied to a category.
 			if ( ! empty( $args['category'] ) && $product->is_type( 'variable' ) ) {
 				$variable_products[] = $product->get_id();
 			}
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php
index b44ae7961cf..d8a0a249ac0 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php
@@ -768,6 +768,7 @@ class WC_REST_Orders_V2_Controller extends WC_REST_CRUD_Controller {
 			if ( $creating ) {
 				$object->set_created_via( 'rest-api' );
 				$object->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
+				$object->save();
 				$object->calculate_totals();
 			} else {
 				// If items have changed, recalculate order totals.
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php
index 27f979b244d..21285137d30 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php
@@ -205,6 +205,7 @@ class WC_REST_Orders_Controller extends WC_REST_Orders_V2_Controller {
 			if ( $creating ) {
 				$object->set_created_via( 'rest-api' );
 				$object->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
+				$object->save();
 				$object->calculate_totals();
 			} else {
 				// If items have changed, recalculate order totals.
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php
index ce0ba6bb95d..1a61edd6c4d 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php
@@ -45,11 +45,9 @@ class WC_REST_Products_Controller extends WC_REST_Products_V2_Controller {
 	protected function get_images( $product ) {
 		$images         = array();
 		$attachment_ids = array();
-		$featured_id    = null;
 
 		// Add featured image.
 		if ( $product->get_image_id() ) {
-			$featured_id      = $product->get_image_id();
 			$attachment_ids[] = $product->get_image_id();
 		}
 
@@ -70,7 +68,6 @@ class WC_REST_Products_Controller extends WC_REST_Products_V2_Controller {
 
 			$images[] = array(
 				'id'                => (int) $attachment_id,
-				'featured'          => (int) $featured_id === (int) $attachment_id,
 				'date_created'      => wc_rest_prepare_date_response( $attachment_post->post_date, false ),
 				'date_created_gmt'  => wc_rest_prepare_date_response( strtotime( $attachment_post->post_date_gmt ) ),
 				'date_modified'     => wc_rest_prepare_date_response( $attachment_post->post_modified, false ),
@@ -308,31 +305,6 @@ class WC_REST_Products_Controller extends WC_REST_Products_V2_Controller {
 		$images = is_array( $images ) ? array_filter( $images ) : array();
 
 		if ( ! empty( $images ) ) {
-			$featured_image_index = 0;
-			$featured_image_count = 0;
-
-			// Collect featured field usage.
-			foreach ( $images as $index => $image ) {
-				if ( isset( $image['featured'] ) && $image['featured'] ) {
-					$featured_image_index = $index;
-					$featured_image_count++;
-				}
-			}
-
-			// Handle multiple featured images.
-			if ( $featured_image_count > 1 ) {
-				throw new WC_REST_Exception(
-					'woocommerce_rest_product_featured_image_count',
-					__( 'Only one featured image is allowed.', 'woocommerce' ),
-					400
-				);
-			}
-
-			// If no featured image is set, and the first image explicitly set to false do not set featured at all.
-			if ( 0 === $featured_image_count && isset( $images[0]['featured'] ) && false === $images[0]['featured'] ) {
-				$featured_image_index = null;
-			}
-
 			$gallery = array();
 
 			foreach ( $images as $index => $image ) {
@@ -357,7 +329,9 @@ class WC_REST_Products_Controller extends WC_REST_Products_V2_Controller {
 					throw new WC_REST_Exception( 'woocommerce_product_invalid_image_id', sprintf( __( '#%s is an invalid image ID.', 'woocommerce' ), $attachment_id ), 400 );
 				}
 
-				if ( $featured_image_index === $index ) {
+				$featured_image = $product->get_image_id();
+
+				if ( 0 === $index ) {
 					$product->set_image_id( $attachment_id );
 				} else {
 					$gallery[] = $attachment_id;
@@ -1279,12 +1253,6 @@ class WC_REST_Products_Controller extends WC_REST_Products_V2_Controller {
 								'type'        => 'integer',
 								'context'     => array( 'view', 'edit' ),
 							),
-							'featured'          => array(
-								'description' => __( 'Featured image.', 'woocommerce' ),
-								'type'        => 'boolean',
-								'default'     => false,
-								'context'     => array( 'view', 'edit' ),
-							),
 							'date_created'      => array(
 								'description' => __( "The date the image was created, in the site's timezone.", 'woocommerce' ),
 								'type'        => 'date-time',
diff --git a/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-products.php b/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-products.php
index 25ac8223eda..9b551b3f2e0 100644
--- a/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-products.php
+++ b/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-products.php
@@ -653,7 +653,7 @@ class WC_Shortcode_Products {
 					$GLOBALS['post'] = get_post( $product_id ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 					setup_postdata( $GLOBALS['post'] );
 
-					// Set custom product visibility when quering hidden products.
+					// Set custom product visibility when querying hidden products.
 					add_action( 'woocommerce_product_is_visible', array( $this, 'set_product_as_visible' ) );
 
 					// Render product template.
diff --git a/plugins/woocommerce/includes/tracks/class-wc-site-tracking.php b/plugins/woocommerce/includes/tracks/class-wc-site-tracking.php
index 2df347dbc56..a23e4292a5b 100644
--- a/plugins/woocommerce/includes/tracks/class-wc-site-tracking.php
+++ b/plugins/woocommerce/includes/tracks/class-wc-site-tracking.php
@@ -64,9 +64,10 @@ class WC_Site_Tracking {
 	 * Adds the tracking function to the admin footer.
 	 */
 	public static function add_tracking_function() {
-		$user           = wp_get_current_user();
-		$server_details = WC_Tracks::get_server_details();
-		$blog_details   = WC_Tracks::get_blog_details( $user->ID );
+		$user            = wp_get_current_user();
+		$server_details  = WC_Tracks::get_server_details();
+		$blog_details    = WC_Tracks::get_blog_details( $user->ID );
+		$tracks_identity = WC_Tracks_Client::get_identity( $user->ID );
 
 		$client_tracking_properties = array_merge( $server_details, $blog_details );
 		/**
@@ -81,6 +82,11 @@ class WC_Site_Tracking {
 		<script type="text/javascript">
 			window.wcTracks = window.wcTracks || {};
 			window.wcTracks.isEnabled = <?php echo self::is_tracking_enabled() ? 'true' : 'false'; ?>;
+			window._tkq = window._tkq || [];
+
+			<?php if ( 'anon' !== $tracks_identity['_ut'] ) { ?>
+			window._tkq.push( [ 'identifyUser', '<?php echo esc_js( $tracks_identity['_ui'] ); ?>' ] );
+			<?php } ?>
 			window.wcTracks.validateEvent = function( eventName, props = {} ) {
 				let isValid = true;
 				if ( ! <?php echo esc_js( WC_Tracks_Event::EVENT_NAME_REGEX ); ?>.test( eventName ) ) {
@@ -124,7 +130,6 @@ class WC_Site_Tracking {
 				if ( ! window.wcTracks.validateEvent( eventName, eventProperties ) ) {
 					return;
 				}
-				window._tkq = window._tkq || [];
 				window._tkq.push( [ 'recordEvent', eventName, eventProperties ] );
 			}
 		</script>
diff --git a/plugins/woocommerce/includes/tracks/events/class-wc-settings-tracking.php b/plugins/woocommerce/includes/tracks/events/class-wc-settings-tracking.php
index 46803b1d13a..d916ad0488e 100644
--- a/plugins/woocommerce/includes/tracks/events/class-wc-settings-tracking.php
+++ b/plugins/woocommerce/includes/tracks/events/class-wc-settings-tracking.php
@@ -28,6 +28,21 @@ class WC_Settings_Tracking {
 	 */
 	protected $updated_options = array();
 
+	/**
+	 * List of option names that are dropdown menus.
+	 *
+	 * @var array
+	 */
+	protected $dropdown_menu_options = array();
+
+
+	/**
+	 * List of options that have been modified.
+	 *
+	 * @var array
+	 */
+	protected $modified_options = array();
+
 	/**
 	 * Toggled options.
 	 *
@@ -44,10 +59,26 @@ class WC_Settings_Tracking {
 	public function init() {
 		add_action( 'woocommerce_settings_page_init', array( $this, 'track_settings_page_view' ) );
 		add_action( 'woocommerce_update_option', array( $this, 'add_option_to_list' ) );
+		add_action( 'woocommerce_update_non_option_setting', array( $this, 'add_option_to_list_and_track_setting_change' ) );
 		add_action( 'woocommerce_update_options', array( $this, 'send_settings_change_event' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'possibly_add_settings_tracking_scripts' ) );
 	}
 
+	/**
+	 * Adds the option to the allowed and updated options directly.
+	 * Currently used for settings that don't use update_option.
+	 *
+	 * @param array $option WooCommerce option that should be updated.
+	 */
+	public function add_option_to_list_and_track_setting_change( $option ) {
+		if ( ! in_array( $option['id'], $this->allowed_options, true ) ) {
+			$this->allowed_options[] = $option['id'];
+		}
+		if ( ! in_array( $option['id'], $this->updated_options, true ) ) {
+			$this->updated_options[] = $option['id'];
+		}
+	}
+
 	/**
 	 * Add a WooCommerce option name to our allowed options list and attach
 	 * the `update_option` hook. Rather than inspecting every updated
@@ -61,6 +92,10 @@ class WC_Settings_Tracking {
 	public function add_option_to_list( $option ) {
 		$this->allowed_options[] = $option['id'];
 
+		if ( isset( $option['options'] ) ) {
+			$this->dropdown_menu_options[] = $option['id'];
+		}
+
 		// Delay attaching this action since it could get fired a lot.
 		if ( false === has_action( 'update_option', array( $this, 'track_setting_change' ) ) ) {
 			add_action( 'update_option', array( $this, 'track_setting_change' ), 10, 3 );
@@ -91,8 +126,10 @@ class WC_Settings_Tracking {
 			return;
 		}
 
-		// Check and save toggled options.
-		if ( in_array( $new_value, array( 'yes', 'no' ), true ) && in_array( $old_value, array( 'yes', 'no' ), true ) ) {
+		if ( in_array( $option_name, $this->dropdown_menu_options, true ) ) {
+			$this->modified_options[ $option_name ] = $new_value;
+		} elseif ( in_array( $new_value, array( 'yes', 'no' ), true ) && in_array( $old_value, array( 'yes', 'no' ), true ) ) {
+			// Save toggled options.
 			$option_state                             = 'yes' === $new_value ? 'enabled' : 'disabled';
 			$this->toggled_options[ $option_state ][] = $option_name;
 		}
@@ -120,6 +157,12 @@ class WC_Settings_Tracking {
 			}
 		}
 
+		if ( ! empty( $this->modified_options ) ) {
+			foreach ( $this->modified_options as $option_name => $selected_option ) {
+				$properties[ $option_name ] = $selected_option ?? '';
+			}
+		}
+
 		$properties['tab']     = $current_tab ?? '';
 		$properties['section'] = $current_section ?? '';
 
diff --git a/plugins/woocommerce/includes/wc-account-functions.php b/plugins/woocommerce/includes/wc-account-functions.php
index 531176e7279..7cefe49d9eb 100644
--- a/plugins/woocommerce/includes/wc-account-functions.php
+++ b/plugins/woocommerce/includes/wc-account-functions.php
@@ -102,7 +102,7 @@ function wc_get_account_menu_items() {
 		'edit-address'    => _n( 'Address', 'Addresses', ( 1 + (int) wc_shipping_enabled() ), 'woocommerce' ),
 		'payment-methods' => __( 'Payment methods', 'woocommerce' ),
 		'edit-account'    => __( 'Account details', 'woocommerce' ),
-		'customer-logout' => __( 'Logout', 'woocommerce' ),
+		'customer-logout' => __( 'Log out', 'woocommerce' ),
 	);
 
 	// Remove missing endpoints.
diff --git a/plugins/woocommerce/includes/wc-core-functions.php b/plugins/woocommerce/includes/wc-core-functions.php
index cb67f8e70d4..86100564f40 100644
--- a/plugins/woocommerce/includes/wc-core-functions.php
+++ b/plugins/woocommerce/includes/wc-core-functions.php
@@ -1560,12 +1560,12 @@ function wc_get_credit_card_type_label( $type ) {
 	$labels = apply_filters(
 		'woocommerce_credit_card_type_labels',
 		array(
-			'mastercard'       => __( 'MasterCard', 'woocommerce' ),
-			'visa'             => __( 'Visa', 'woocommerce' ),
-			'discover'         => __( 'Discover', 'woocommerce' ),
-			'american express' => __( 'American Express', 'woocommerce' ),
-			'diners'           => __( 'Diners', 'woocommerce' ),
-			'jcb'              => __( 'JCB', 'woocommerce' ),
+			'mastercard'       => _x( 'MasterCard', 'Name of credit card', 'woocommerce' ),
+			'visa'             => _x( 'Visa', 'Name of credit card', 'woocommerce' ),
+			'discover'         => _x( 'Discover', 'Name of credit card', 'woocommerce' ),
+			'american express' => _x( 'American Express', 'Name of credit card', 'woocommerce' ),
+			'diners'           => _x( 'Diners', 'Name of credit card', 'woocommerce' ),
+			'jcb'              => _x( 'JCB', 'Name of credit card', 'woocommerce' ),
 		)
 	);
 
diff --git a/plugins/woocommerce/includes/wc-product-functions.php b/plugins/woocommerce/includes/wc-product-functions.php
index f27291d3ca9..da041dbb0ea 100644
--- a/plugins/woocommerce/includes/wc-product-functions.php
+++ b/plugins/woocommerce/includes/wc-product-functions.php
@@ -698,7 +698,7 @@ function wc_get_product_variation_attributes( $variation_id ) {
 			$attribute                 = 'attribute_' . sanitize_title( $attribute_name );
 			$found_parent_attributes[] = $attribute;
 			if ( ! array_key_exists( $attribute, $variation_attributes ) ) {
-				$variation_attributes[ $attribute ] = ''; // Add it - 'any' will be asumed.
+				$variation_attributes[ $attribute ] = ''; // Add it - 'any' will be assumed.
 			}
 		}
 	}
diff --git a/plugins/woocommerce/includes/wc-template-functions.php b/plugins/woocommerce/includes/wc-template-functions.php
index 09a1c18eb34..4d0ef67c979 100644
--- a/plugins/woocommerce/includes/wc-template-functions.php
+++ b/plugins/woocommerce/includes/wc-template-functions.php
@@ -817,7 +817,7 @@ function wc_privacy_policy_page_id() {
 }
 
 /**
- * See if the checkbox is enabled or not based on the existance of the terms page and checkbox text.
+ * See if the checkbox is enabled or not based on the existence of the terms page and checkbox text.
  *
  * @since 3.4.0
  * @return bool
@@ -1365,12 +1365,17 @@ if ( ! function_exists( 'woocommerce_template_loop_add_to_cart' ) ) {
 					'data-product_id'  => $product->get_id(),
 					'data-product_sku' => $product->get_sku(),
 					'aria-label'       => $product->add_to_cart_description(),
+					'aria-describedby' => $product->add_to_cart_aria_describedby(),
 					'rel'              => 'nofollow',
 				),
 			);
 
 			$args = apply_filters( 'woocommerce_loop_add_to_cart_args', wp_parse_args( $args, $defaults ), $product );
 
+			if ( ! empty( $args['attributes']['aria-describedby'] ) ) {
+				$args['attributes']['aria-describedby'] = wp_strip_all_tags( $args['attributes']['aria-describedby'] );
+			}
+
 			if ( isset( $args['attributes']['aria-label'] ) ) {
 				$args['attributes']['aria-label'] = wp_strip_all_tags( $args['attributes']['aria-label'] );
 			}
@@ -2747,6 +2752,7 @@ if ( ! function_exists( 'woocommerce_order_again_button' ) ) {
 			'order/order-again.php',
 			array(
 				'order'           => $order,
+				'wp_button_class' => wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '',
 				'order_again_url' => wp_nonce_url( add_query_arg( 'order_again', $order->get_id(), wc_get_cart_url() ), 'woocommerce-order_again' ),
 			)
 		);
@@ -3548,7 +3554,7 @@ function wc_display_product_attributes( $product ) {
 	 * Hook: woocommerce_display_product_attributes.
 	 *
 	 * @since 3.6.0.
-	 * @param array $product_attributes Array of atributes to display; label, value.
+	 * @param array $product_attributes Array of attributes to display; label, value.
 	 * @param WC_Product $product Showing attributes for this product.
 	 */
 	$product_attributes = apply_filters( 'woocommerce_display_product_attributes', $product_attributes, $product );
diff --git a/plugins/woocommerce/includes/wc-term-functions.php b/plugins/woocommerce/includes/wc-term-functions.php
index 3cbc7032a81..fbe13b3f5f6 100644
--- a/plugins/woocommerce/includes/wc-term-functions.php
+++ b/plugins/woocommerce/includes/wc-term-functions.php
@@ -295,7 +295,7 @@ add_action( 'wp_upgrade', 'wc_taxonomy_metadata_migrate_data', 10, 2 );
  *
  * @param int    $the_term Term ID.
  * @param int    $next_id  The id of the next sibling element in save hierarchy level.
- * @param string $taxonomy Taxnomy.
+ * @param string $taxonomy Taxonomy.
  * @param int    $index    Term index (default: 0).
  * @param mixed  $terms    List of terms. (default: null).
  * @return int
@@ -594,7 +594,7 @@ function wc_clear_term_product_ids( $object_id, $terms, $tt_ids, $taxonomy, $app
 add_action( 'set_object_terms', 'wc_clear_term_product_ids', 10, 6 );
 
 /**
- * Get full list of product visibilty term ids.
+ * Get full list of product visibility term ids.
  *
  * @since  3.0.0
  * @return int[]
diff --git a/plugins/woocommerce/includes/wc-update-functions.php b/plugins/woocommerce/includes/wc-update-functions.php
index f648d30a4bc..c93afd8de24 100644
--- a/plugins/woocommerce/includes/wc-update-functions.php
+++ b/plugins/woocommerce/includes/wc-update-functions.php
@@ -1903,7 +1903,7 @@ function wc_update_350_db_version() {
 }
 
 /**
- * Drop the fk_wc_download_log_permission_id FK as we use a new one with the table and blog prefix for MS compatability.
+ * Drop the fk_wc_download_log_permission_id FK as we use a new one with the table and blog prefix for MS compatibility.
  *
  * @return void
  */
diff --git a/plugins/woocommerce/includes/widgets/class-wc-widget-cart.php b/plugins/woocommerce/includes/widgets/class-wc-widget-cart.php
index cc76280b5a7..0d33873c5cc 100644
--- a/plugins/woocommerce/includes/widgets/class-wc-widget-cart.php
+++ b/plugins/woocommerce/includes/widgets/class-wc-widget-cart.php
@@ -56,6 +56,8 @@ class WC_Widget_Cart extends WC_Widget {
 			return;
 		}
 
+		wp_enqueue_script( 'wc-cart-fragments' );
+
 		$hide_if_empty = empty( $instance['hide_if_empty'] ) ? 0 : 1;
 
 		if ( ! isset( $instance['title'] ) ) {
diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json
index d2d64f819c2..de149e7e904 100644
--- a/plugins/woocommerce/package.json
+++ b/plugins/woocommerce/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "woocommerce",
 	"title": "WooCommerce",
-	"version": "7.8.0",
+	"version": "7.9.0",
 	"homepage": "https://woocommerce.com/",
 	"repository": {
 		"type": "git",
@@ -29,23 +29,24 @@
 		"docker:down": "pnpm exec wc-e2e docker:down",
 		"docker:ssh": "pnpm exec wc-e2e docker:ssh",
 		"docker:up": "pnpm exec wc-e2e docker:up",
-		"env:dev": "pnpm wp-env start",
+		"env:dev": "pnpm wp-env start --update",
 		"update-wp-env": "php ./tests/e2e-pw/bin/update-wp-env.php",
-		"env:test": "pnpm run update-wp-env && pnpm run env:dev && ./tests/e2e-pw/bin/test-env-setup.sh",
+		"env:test": "WP_ENV_AFTER_SETUP='./tests/e2e-pw/bin/test-env-setup.sh' && pnpm run env:dev",
 		"test:e2e-pw": "USE_WP_ENV=1 pnpm playwright test --config=tests/e2e-pw/playwright.config.js",
 		"test:api-pw": "USE_WP_ENV=1 pnpm playwright test --config=tests/api-core-tests/playwright.config.js",
-		"env:start": "pnpm wp-env start && ./tests/e2e-pw/bin/test-env-setup.sh",
-		"env:restart": "pnpm wp-env destroy && pnpm wp-env start && ./tests/e2e-pw/bin/test-env-setup.sh",
+		"env:start": "pnpm wp-env start",
+		"env:restart": "pnpm wp-env destroy && pnpm wp-env start --update",
 		"env:stop": "pnpm wp-env stop",
-		"env:test:cot": "pnpm run update-wp-env && pnpm run env:dev && ENABLE_HPOS=1 ./tests/e2e-pw/bin/test-env-setup.sh",
+		"env:test:cot": "WP_ENV_AFTER_SETUP='ENABLE_HPOS=1 ./tests/e2e-pw/bin/test-env-setup.sh' && ENABLE_HPOS=1 pnpm run env:dev",
 		"env:performance-init": "./tests/performance/bin/init-sample-products.sh",
 		"env:down": "pnpm wp-env stop",
-		"env:destroy": "pnpm run update-wp-env && pnpm wp-env destroy",
+		"env:destroy": "pnpm wp-env destroy",
 		"test:api": "API_TEST_REPORT_DIR=\"$PWD/tests/api\" pnpm exec wc-api-tests test api",
 		"make:collection": "pnpm exec wc-api-tests make:collection",
 		"e2e:debug": "pnpm exec wc-e2e test:e2e-debug",
 		"e2e:dev": "pnpm exec wc-e2e test:e2e-dev",
 		"test:unit": "./vendor/bin/phpunit -c ./phpunit.xml",
+		"test:unit:env": "wp-env run --env-cwd='wp-content/plugins/woocommerce' tests-cli vendor/bin/phpunit -c phpunit.xml --verbose",
 		"makepot": "composer run-script makepot",
 		"packages:fix:textdomain": "node ./bin/package-update-textdomain.js"
 	},
@@ -54,7 +55,7 @@
 		"@babel/core": "7.12.9",
 		"@babel/preset-env": "7.12.7",
 		"@babel/register": "7.12.1",
-		"@playwright/test": "^1.30.0",
+		"@playwright/test": "^1.33.0",
 		"@typescript-eslint/eslint-plugin": "^5.54.0",
 		"@typescript-eslint/experimental-utils": "^5.43.0",
 		"@typescript-eslint/parser": "^5.54.0",
@@ -68,7 +69,7 @@
 		"@woocommerce/woocommerce-rest-api": "^1.0.1",
 		"@wordpress/babel-plugin-import-jsx-pragma": "1.1.3",
 		"@wordpress/babel-preset-default": "3.0.2",
-		"@wordpress/env": "^4.8.0",
+		"@wordpress/env": "^7.0.0",
 		"@wordpress/stylelint-config": "19.1.0",
 		"allure-commandline": "^2.17.2",
 		"allure-playwright": "^2.0.0-beta.16",
diff --git a/plugins/woocommerce/readme.txt b/plugins/woocommerce/readme.txt
index ee6205a8aac..c013428aebe 100644
--- a/plugins/woocommerce/readme.txt
+++ b/plugins/woocommerce/readme.txt
@@ -163,6 +163,6 @@ WooCommerce comes with some sample data you can use to see how products look; im
 
 == Changelog ==
 
-= 7.8.0 2023-XX-XX =
+= 7.9.0 2023-XX-XX =
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/changelog.txt).
diff --git a/plugins/woocommerce/src/Admin/API/Init.php b/plugins/woocommerce/src/Admin/API/Init.php
index d0e6197ec7e..cb60a85197f 100644
--- a/plugins/woocommerce/src/Admin/API/Init.php
+++ b/plugins/woocommerce/src/Admin/API/Init.php
@@ -37,7 +37,7 @@ class Init {
 	}
 
 	/**
-	 * Boostrap REST API.
+	 * Bootstrap REST API.
 	 */
 	public function __construct() {
 		// Hook in data stores.
@@ -87,6 +87,7 @@ class Init {
 			'Automattic\WooCommerce\Admin\API\OnboardingProfile',
 			'Automattic\WooCommerce\Admin\API\OnboardingTasks',
 			'Automattic\WooCommerce\Admin\API\OnboardingThemes',
+			'Automattic\WooCommerce\Admin\API\OnboardingPlugins',
 			'Automattic\WooCommerce\Admin\API\NavigationFavorites',
 			'Automattic\WooCommerce\Admin\API\Taxes',
 			'Automattic\WooCommerce\Admin\API\MobileAppMagicLink',
diff --git a/plugins/woocommerce/src/Admin/API/OnboardingFreeExtensions.php b/plugins/woocommerce/src/Admin/API/OnboardingFreeExtensions.php
index 4719ceff621..71336fee518 100644
--- a/plugins/woocommerce/src/Admin/API/OnboardingFreeExtensions.php
+++ b/plugins/woocommerce/src/Admin/API/OnboardingFreeExtensions.php
@@ -10,6 +10,11 @@ namespace Automattic\WooCommerce\Admin\API;
 defined( 'ABSPATH' ) || exit;
 
 use Automattic\WooCommerce\Internal\Admin\RemoteFreeExtensions\Init as RemoteFreeExtensions;
+use WC_REST_Data_Controller;
+use WP_Error;
+use WP_REST_Request;
+use WP_REST_Response;
+use WP_REST_Server;
 
 /**
  * Onboarding Payments Controller.
@@ -17,7 +22,7 @@ use Automattic\WooCommerce\Internal\Admin\RemoteFreeExtensions\Init as RemoteFre
  * @internal
  * @extends WC_REST_Data_Controller
  */
-class OnboardingFreeExtensions extends \WC_REST_Data_Controller {
+class OnboardingFreeExtensions extends WC_REST_Data_Controller {
 
 	/**
 	 * Endpoint namespace.
@@ -42,7 +47,7 @@ class OnboardingFreeExtensions extends \WC_REST_Data_Controller {
 			'/' . $this->rest_base,
 			array(
 				array(
-					'methods'             => \WP_REST_Server::READABLE,
+					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_available_extensions' ),
 					'permission_callback' => array( $this, 'get_items_permissions_check' ),
 				),
@@ -59,7 +64,7 @@ class OnboardingFreeExtensions extends \WC_REST_Data_Controller {
 	 */
 	public function get_items_permissions_check( $request ) {
 		if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
-			return new \WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+			return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
 		}
 
 		return true;
@@ -68,12 +73,29 @@ class OnboardingFreeExtensions extends \WC_REST_Data_Controller {
 	/**
 	 * Return available payment methods.
 	 *
-	 * @param \WP_REST_Request $request Request data.
+	 * @param WP_REST_Request $request Request data.
 	 *
-	 * @return \WP_Error|\WP_REST_Response
+	 * @return WP_Error|WP_REST_Response
 	 */
 	public function get_available_extensions( $request ) {
-		return RemoteFreeExtensions::get_extensions();
+		$extensions = RemoteFreeExtensions::get_extensions();
+		/**
+		* Remove Jetpack when woocommerce_suggest_jetpack is false.
+		 *
+		 * @since 7.8
+		*/
+		if ( false === apply_filters( 'woocommerce_suggest_jetpack', true ) ) {
+			foreach ( $extensions as &$extension ) {
+				$extension['plugins'] = array_filter(
+					$extension['plugins'],
+					function( $plugin ) {
+						return 'jetpack' !== $plugin->key;
+					}
+				);
+			}
+		}
+
+		return new WP_REST_Response( $extensions );
 	}
 
 }
diff --git a/plugins/woocommerce/src/Admin/API/OnboardingPlugins.php b/plugins/woocommerce/src/Admin/API/OnboardingPlugins.php
new file mode 100644
index 00000000000..cbafe06c163
--- /dev/null
+++ b/plugins/woocommerce/src/Admin/API/OnboardingPlugins.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * REST API Onboarding Profile Controller
+ *
+ * Handles requests to /onboarding/profile
+ */
+
+namespace Automattic\WooCommerce\Admin\API;
+
+defined( 'ABSPATH' ) || exit;
+
+use ActionScheduler;
+use Automattic\WooCommerce\Admin\PluginsHelper;
+use Automattic\WooCommerce\Admin\PluginsInstallLoggers\AsynPluginsInstallLogger;
+use WC_REST_Data_Controller;
+use WP_Error;
+use WP_REST_Request;
+use WP_REST_Response;
+
+/**
+ * Onboarding Plugins controller.
+ *
+ * @internal
+ * @extends WC_REST_Data_Controller
+ */
+class OnboardingPlugins extends WC_REST_Data_Controller {
+	/**
+	 * Endpoint namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'wc-admin';
+
+	/**
+	 * Route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = 'onboarding/plugins';
+
+	/**
+	 * Register routes.
+	 */
+	public function register_routes() {
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/install-async',
+			array(
+				array(
+					'methods'             => 'POST',
+					'callback'            => array( $this, 'install_async' ),
+					'permission_callback' => array( $this, 'can_install_plugins' ),
+					'args'                => array(
+						'plugins' => array(
+							'description'       => 'A list of plugins to install',
+							'type'              => 'array',
+							'items'             => 'string',
+							'sanitize_callback' => function ( $value ) {
+								return array_map(
+									function ( $value ) {
+										return sanitize_text_field( $value );
+									},
+									$value
+								);
+							},
+							'required'          => true,
+						),
+					),
+				),
+				'schema' => array( $this, 'get_install_async_schema' ),
+			)
+		);
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/install-and-activate',
+			array(
+				array(
+					'methods'             => 'POST',
+					'callback'            => array( $this, 'install_and_activate' ),
+					'permission_callback' => array( $this, 'can_install_and_activate_plugins' ),
+
+				),
+				'schema' => array( $this, 'get_install_activate_schema' ),
+			)
+		);
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/scheduled-installs/(?P<job_id>\w+)',
+			array(
+				array(
+					'methods'             => 'GET',
+					'callback'            => array( $this, 'get_scheduled_installs' ),
+					'permission_callback' => array( $this, 'can_install_plugins' ),
+				),
+				'schema' => array( $this, 'get_install_async_schema' ),
+			)
+		);
+	}
+
+	/**
+	 * Install and activate a plugin.
+	 *
+	 * @param WP_REST_Request $request WP Request object.
+	 *
+	 * @return WP_REST_Response
+	 */
+	public function install_and_activate( WP_REST_Request $request ) {
+		$response             = array();
+		$response['install']  = PluginsHelper::install_plugins( $request->get_param( 'plugins' ) );
+		$response['activate'] = PluginsHelper::activate_plugins( $response['install']['installed'] );
+
+		return new WP_REST_Response( $response );
+	}
+
+	/**
+	 * Queue plugin install request.
+	 *
+	 * @param WP_REST_Request $request WP_REST_Request object.
+	 *
+	 * @return array
+	 */
+	public function install_async( WP_REST_Request $request ) {
+		$plugins = $request->get_param( 'plugins' );
+		$job_id  = uniqid();
+
+		WC()->queue()->add( 'woocommerce_plugins_install_async_callback', array( $plugins, $job_id ) );
+
+		$plugin_status = array();
+		foreach ( $plugins as $plugin ) {
+			$plugin_status[ $plugin ] = array(
+				'status' => 'pending',
+				'errors' => array(),
+			);
+		}
+
+		return array(
+			'job_id'  => $job_id,
+			'status'  => 'pending',
+			'plugins' => $plugin_status,
+		);
+	}
+
+	/**
+	 * Returns current status of given job.
+	 *
+	 * @param WP_REST_Request $request WP_REST_Request object.
+	 *
+	 * @return array|WP_REST_Response
+	 */
+	public function get_scheduled_installs( WP_REST_Request $request ) {
+		$job_id = $request->get_param( 'job_id' );
+
+		$actions = WC()->queue()->search(
+			array(
+				'hook'    => 'woocommerce_plugins_install_async_callback',
+				'search'  => $job_id,
+				'orderby' => 'date',
+				'order'   => 'DESC',
+			)
+		);
+
+		$actions = array_filter(
+			PluginsHelper::get_action_data( $actions ),
+			function( $action ) use ( $job_id ) {
+				return $action['job_id'] === $job_id;
+			}
+		);
+
+		if ( empty( $actions ) ) {
+			return new WP_REST_Response( null, 404 );
+		}
+
+		$response = array(
+			'job_id' => $actions[0]['job_id'],
+			'status' => $actions[0]['status'],
+		);
+
+		$option = get_option( 'woocommerce_onboarding_plugins_install_async_' . $job_id );
+		if ( isset( $option['plugins'] ) ) {
+			$response['plugins'] = $option['plugins'];
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Check whether the current user has permission to install plugins
+	 *
+	 * @return WP_Error|boolean
+	 */
+	public function can_install_plugins() {
+		if ( ! current_user_can( 'install_plugins' ) ) {
+			return new WP_Error(
+				'woocommerce_rest_cannot_update',
+				__( 'Sorry, you cannot manage plugins.', 'woocommerce' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check whether the current user has permission to install and activate plugins
+	 *
+	 * @return WP_Error|boolean
+	 */
+	public function can_install_and_activate_plugins() {
+		if ( ! current_user_can( 'install_plugins' ) || ! current_user_can( 'activate_plugins' ) ) {
+			return new WP_Error(
+				'woocommerce_rest_cannot_update',
+				__( 'Sorry, you cannot manage plugins.', 'woocommerce' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * JSON Schema for both install-async and scheduled-installs endpoints.
+	 *
+	 * @return array
+	 */
+	public function get_install_async_schema() {
+		return array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'Install Async Schema',
+			'type'       => 'object',
+			'properties' => array(
+				'type'       => 'object',
+				'properties' => array(
+					'job_id' => 'integer',
+					'status' => array(
+						'type' => 'string',
+						'enum' => array( 'pending', 'complete', 'failed' ),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * JSON Schema for install-and-activate endpoint.
+	 *
+	 * @return array
+	 */
+	public function get_install_activate_schema() {
+		$error_schema = array(
+			'type'              => 'object',
+			'patternProperties' => array(
+				'^.*$' => array(
+					'type' => 'string',
+				),
+			),
+			'items'             => array(
+				'type' => 'string',
+			),
+		);
+
+		$install_schema = array(
+			'type'       => 'object',
+			'properties' => array(
+				'installed' => array(
+					'type'  => 'array',
+					'items' => array(
+						'type' => 'string',
+					),
+				),
+				'results'   => array(
+					'type'  => 'array',
+					'items' => array(
+						'type' => 'string',
+					),
+				),
+				'errors'    => array(
+					'type'       => 'object',
+					'properties' => array(
+						'errors'     => $error_schema,
+						'error_data' => $error_schema,
+					),
+				),
+			),
+		);
+
+		$activate_schema = array(
+			'type'       => 'object',
+			'properties' => array(
+				'activated' => array(
+					'type'  => 'array',
+					'items' => array(
+						'type' => 'string',
+					),
+				),
+				'active'    => array(
+					'type'  => 'array',
+					'items' => array(
+						'type' => 'string',
+					),
+				),
+				'errors'    => array(
+					'type'       => 'object',
+					'properties' => array(
+						'errors'     => $error_schema,
+						'error_data' => $error_schema,
+					),
+				),
+			),
+		);
+
+		return array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'Install and Activate Schema',
+			'type'       => 'object',
+			'properties' => array(
+				'type'       => 'object',
+				'properties' => array(
+					'install'  => $install_schema,
+					'activate' => $activate_schema,
+				),
+			),
+		);
+	}
+}
diff --git a/plugins/woocommerce/src/Admin/API/OnboardingTasks.php b/plugins/woocommerce/src/Admin/API/OnboardingTasks.php
index a7e80da382d..9f637873ed7 100644
--- a/plugins/woocommerce/src/Admin/API/OnboardingTasks.php
+++ b/plugins/woocommerce/src/Admin/API/OnboardingTasks.php
@@ -295,10 +295,14 @@ class OnboardingTasks extends \WC_REST_Data_Controller {
 	/**
 	 * Check if a given request has access to manage woocommerce.
 	 *
+	 * @deprecated 7.8.0 snooze task is deprecated.
+	 *
 	 * @param  WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|boolean
 	 */
 	public function snooze_task_permissions_check( $request ) {
+		wc_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '7.8.0' );
+
 		if ( ! current_user_can( 'manage_woocommerce' ) ) {
 			return new \WP_Error( 'woocommerce_rest_cannot_create', __( 'Sorry, you are not allowed to snooze onboarding tasks.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
 		}
@@ -816,11 +820,15 @@ class OnboardingTasks extends \WC_REST_Data_Controller {
 	/**
 	 * Snooze an onboarding task.
 	 *
+	 * @deprecated 7.8.0 snooze task is deprecated.
+	 *
 	 * @param WP_REST_Request $request Request data.
 	 *
 	 * @return WP_REST_Response|WP_Error
 	 */
 	public function snooze_task( $request ) {
+		wc_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '7.8.0' );
+
 		$task_id      = $request->get_param( 'id' );
 		$task_list_id = $request->get_param( 'task_list_id' );
 		$duration     = $request->get_param( 'duration' );
@@ -853,10 +861,14 @@ class OnboardingTasks extends \WC_REST_Data_Controller {
 	/**
 	 * Undo snooze of a single task.
 	 *
+	 * @deprecated 7.8.0 undo snooze task is deprecated.
+	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Request|WP_Error
 	 */
 	public function undo_snooze_task( $request ) {
+		wc_deprecated_function( __CLASS__ . '::' . __FUNCTION__, '7.8.0' );
+
 		$id   = $request->get_param( 'id' );
 		$task = TaskLists::get_task( $id );
 
diff --git a/plugins/woocommerce/src/Admin/API/Options.php b/plugins/woocommerce/src/Admin/API/Options.php
index c37a6058931..bd9062bb332 100644
--- a/plugins/woocommerce/src/Admin/API/Options.php
+++ b/plugins/woocommerce/src/Admin/API/Options.php
@@ -183,6 +183,14 @@ class Options extends \WC_REST_Data_Controller {
 			'woocommerce_admin_created_default_shipping_zones',
 			'woocommerce_admin_reviewed_default_shipping_zones',
 			'woocommerce_admin_reviewed_store_location_settings',
+			'woocommerce_ces_product_feedback_shown',
+			'woocommerce_marketing_overview_multichannel_banner_dismissed',
+			'woocommerce_dimension_unit',
+			'woocommerce_weight_unit',
+			'woocommerce_ces_product_mvp_ces_action',
+			'woocommerce_product_tour_modal_hidden',
+			'woocommerce_revenue_report_date_tour_shown',
+			'woocommerce_date_type',
 		);
 
 		$theme_permissions = array(
diff --git a/plugins/woocommerce/src/Admin/API/ProductVariations.php b/plugins/woocommerce/src/Admin/API/ProductVariations.php
index a5307500a9b..aaf69ac5b2e 100644
--- a/plugins/woocommerce/src/Admin/API/ProductVariations.php
+++ b/plugins/woocommerce/src/Admin/API/ProductVariations.php
@@ -129,7 +129,7 @@ class ProductVariations extends \WC_REST_Product_Variations_Controller {
 			unset( $args['s'] );
 		}
 
-		// Retreive variations without specifying a parent product.
+		// Retrieve variations without specifying a parent product.
 		if ( "/{$this->namespace}/variations" === $request->get_route() ) {
 			unset( $args['post_parent'] );
 		}
diff --git a/plugins/woocommerce/src/Admin/API/Products.php b/plugins/woocommerce/src/Admin/API/Products.php
index 2e9e16c7aab..e4353df76ce 100644
--- a/plugins/woocommerce/src/Admin/API/Products.php
+++ b/plugins/woocommerce/src/Admin/API/Products.php
@@ -142,7 +142,7 @@ class Products extends \WC_REST_Products_Controller {
 	/**
 	 * Check whether the request is for products low in stock.
 	 *
-	 * It matches requests with paramaters:
+	 * It matches requests with parameters:
 	 *
 	 * low_in_stock = true
 	 * page = 1
diff --git a/plugins/woocommerce/src/Admin/API/Templates/digital_product.csv b/plugins/woocommerce/src/Admin/API/Templates/digital_product.csv
index bcf66a3ec59..e2d1f49a02d 100644
--- a/plugins/woocommerce/src/Admin/API/Templates/digital_product.csv
+++ b/plugins/woocommerce/src/Admin/API/Templates/digital_product.csv
@@ -1,2 +1,2 @@
-Type,Name,Published,"Is featured?","Visibility in catalog","Short description",Description,"Date sale price starts","Date sale price ends","Tax status","Tax class","In stock?",Stock,"Backorders allowed?","Sold individually?","Weight (lbs)","Length (in)","Width (in)","Height (in)","Allow customer reviews?","Purchase note","Sale price","Regular price",Categories,Tags,"Shipping class",Images,"Download limit","Download expiry days",Parent,"Grouped products",Upsells,Cross-sells,"External URL","Button text",Position,"Attribute 1 name","Attribute 1 value(s)","Attribute 1 visible","Attribute 1 global","Attribute 2 name","Attribute 2 value(s)","Attribute 2 visible","Attribute 2 global","Meta: _wpcom_is_markdown","Download 1 name","Download 1 URL","Download 2 name","Download 2 URL"
-"simple, downloadable, virtual",Album,0,0,visible,"This is a simple, virtual product.","Album reviewed and chosen by Woo.",,,taxable,,1,,0,0,,,,,1,,,15,Music,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2022/05/album-1.jpg,1,1,,,,,,,0,,,,,,,,,1,"Single 1",https://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2017/08/single.jpg,"Single 2",https://demo.woothemes.com/woocommerce/wp-content/uploads/sites/56/2017/08/album.jpg
+Type,Name,Published
+"simple, downloadable, virtual",,-1
\ No newline at end of file
diff --git a/plugins/woocommerce/src/Admin/API/Templates/external_product.csv b/plugins/woocommerce/src/Admin/API/Templates/external_product.csv
index e3a69124c2e..f98d1d7c7a3 100644
--- a/plugins/woocommerce/src/Admin/API/Templates/external_product.csv
+++ b/plugins/woocommerce/src/Admin/API/Templates/external_product.csv
@@ -1,2 +1,2 @@
-Type,Name,Published,"Is featured?","Visibility in catalog","Short description",Description,"Date sale price starts","Date sale price ends","Tax status","Tax class","In stock?",Stock,"Backorders allowed?","Sold individually?","Weight (lbs)","Length (in)","Width (in)","Height (in)","Allow customer reviews?","Purchase note","Sale price","Regular price",Categories,Tags,"Shipping class",Images,"Download limit","Download expiry days",Parent,"Grouped products",Upsells,Cross-sells,"External URL","Button text",Position,"Attribute 1 name","Attribute 1 value(s)","Attribute 1 visible","Attribute 1 global","Attribute 2 name","Attribute 2 value(s)","Attribute 2 visible","Attribute 2 global","Meta: _wpcom_is_markdown","Download 1 name","Download 1 URL","Download 2 name","Download 2 URL"
-external,WordPress Pennant,0,0,visible,"This is an external product.","High Quality 36 x 12 inches Wordpress Pennant.",,,"taxable",,"1",,"0","0",,,,,"1",,,"111.05",Decor,,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/pennant-1.jpg,,,,,,,"https://mercantile.wordpress.org/product/wordpress-pennant/","Buy on the WordPress swag store!",0,,,,,,,,,"1",,,,
+Type,Name,Published
+external,,-1
\ No newline at end of file
diff --git a/plugins/woocommerce/src/Admin/API/Templates/grouped_product.csv b/plugins/woocommerce/src/Admin/API/Templates/grouped_product.csv
index fae863ec60c..1d3a569e22c 100644
--- a/plugins/woocommerce/src/Admin/API/Templates/grouped_product.csv
+++ b/plugins/woocommerce/src/Admin/API/Templates/grouped_product.csv
@@ -1,2 +1,2 @@
-Type,Name,Published,"Is featured?","Visibility in catalog","Short description",Description,"Date sale price starts","Date sale price ends","Tax status","Tax class","In stock?",Stock,"Backorders allowed?","Sold individually?","Weight (lbs)","Length (in)","Width (in)","Height (in)","Allow customer reviews?","Purchase note","Sale price","Regular price",Categories,Tags,"Shipping class",Images,"Download limit","Download expiry days",Parent,"Grouped products",Upsells,Cross-sells,"External URL","Button text",Position,"Attribute 1 name","Attribute 1 value(s)","Attribute 1 visible","Attribute 1 global","Attribute 2 name","Attribute 2 value(s)","Attribute 2 visible","Attribute 2 global","Meta: _wpcom_is_markdown","Download 1 name","Download 1 URL","Download 2 name","Download 2 URL"
-grouped,Logo Collection,0,0,visible,"This is a grouped product.","This collection consists of beanies, t-shirts and hoodies.",,,"taxable",,"1",,"0","0",,,,,"1",,,,Clothing,,,"https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/logo-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/beanie-with-logo-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/t-shirt-with-logo-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-logo-2.jpg",,,,"woo-hoodie-with-logo, woo-tshirt, woo-beanie",,,,,0,,,,,,,,,"1",,,,
+Type,Name,Published
+grouped,,-1
diff --git a/plugins/woocommerce/src/Admin/API/Templates/physical_product.csv b/plugins/woocommerce/src/Admin/API/Templates/physical_product.csv
index 4f3738e40ae..39896938bdd 100644
--- a/plugins/woocommerce/src/Admin/API/Templates/physical_product.csv
+++ b/plugins/woocommerce/src/Admin/API/Templates/physical_product.csv
@@ -1,2 +1,2 @@
-Type,Name,Published,"Is featured?","Visibility in catalog","Short description",Description,"Date sale price starts","Date sale price ends","Tax status","Tax class","In stock?",Stock,"Backorders allowed?","Sold individually?","Weight (lbs)","Length (in)","Width (in)","Height (in)","Allow customer reviews?","Purchase note","Sale price","Regular price",Categories,Tags,"Shipping class",Images,"Download limit","Download expiry days",Parent,"Grouped products",Upsells,Cross-sells,"External URL","Button text",Position,"Attribute 1 name","Attribute 1 value(s)","Attribute 1 visible","Attribute 1 global","Attribute 2 name","Attribute 2 value(s)","Attribute 2 visible","Attribute 2 global","Meta: _wpcom_is_markdown","Download 1 name","Download 1 URL","Download 2 name","Download 2 URL"
-simple,"Hoodie with Logo",0,0,visible,"This is a simple product.","Hoodie in sweatshirt fabric made from a cotton blend.",,,taxable,,1,,0,0,2,10,6,3,1,,,45,"Clothing > Hoodies",,,https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/hoodie-with-logo-2.jpg,,,,,,,,,0,Color,Blue,1,1,,,,,1,,,,
+Type,Name,Published
+simple,,-1
\ No newline at end of file
diff --git a/plugins/woocommerce/src/Admin/API/Templates/variable_product.csv b/plugins/woocommerce/src/Admin/API/Templates/variable_product.csv
index 7be3a63a891..35c24a2c38e 100644
--- a/plugins/woocommerce/src/Admin/API/Templates/variable_product.csv
+++ b/plugins/woocommerce/src/Admin/API/Templates/variable_product.csv
@@ -1,2 +1,2 @@
-Type,Name,Published,"Is featured?","Visibility in catalog","Short description",Description,"Date sale price starts","Date sale price ends","Tax status","Tax class","In stock?",Stock,"Backorders allowed?","Sold individually?","Weight (lbs)","Length (in)","Width (in)","Height (in)","Allow customer reviews?","Purchase note","Sale price","Regular price",Categories,Tags,"Shipping class",Images,"Download limit","Download expiry days",Parent,"Grouped products",Upsells,Cross-sells,"External URL","Button text",Position,"Attribute 1 name","Attribute 1 value(s)","Attribute 1 visible","Attribute 1 global","Attribute 2 name","Attribute 2 value(s)","Attribute 2 visible","Attribute 2 global","Meta: _wpcom_is_markdown","Download 1 name","Download 1 URL","Download 2 name","Download 2 URL"
-variable,"V-Neck T-Shirt",0,1,visible,"This is a variable product.","Relaxed-fit T-shirt in soft cotton (Available in Blue Green and Red).",,,taxable,,1,,0,0,.5,24,1,2,1,,,,"Clothing > Tshirts",,,"https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vneck-tee-2.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vnech-tee-green-1.jpg, https://woocommercecore.mystagingwebsite.com/wp-content/uploads/2017/12/vnech-tee-blue-1.jpg",,,,,,,,,0,Color,"Blue, Green, Red",1,1,Size,"Large, Medium, Small",1,1,1,,,,
+Type,Name,Published
+variable,,-1
\ No newline at end of file
diff --git a/plugins/woocommerce/src/Admin/Features/AsyncProductEditorCategoryField/Init.php b/plugins/woocommerce/src/Admin/Features/AsyncProductEditorCategoryField/Init.php
index a33411d3dee..89b53f0ac00 100644
--- a/plugins/woocommerce/src/Admin/Features/AsyncProductEditorCategoryField/Init.php
+++ b/plugins/woocommerce/src/Admin/Features/AsyncProductEditorCategoryField/Init.php
@@ -46,9 +46,10 @@ class Init {
 	 * Enqueue scripts needed for the product form block editor.
 	 */
 	public function enqueue_scripts() {
-		if ( ! PageController::is_admin_or_embed_page() ) {
+		if ( ! PageController::is_embed_page() ) {
 			return;
 		}
+
 		WCAdminAssets::register_script( 'wp-admin-scripts', 'product-category-metabox', true );
 		wp_localize_script(
 			'wc-admin-product-category-metabox',
@@ -66,7 +67,7 @@ class Init {
 	 * Enqueue styles needed for the rich text editor.
 	 */
 	public function enqueue_styles() {
-		if ( ! PageController::is_admin_or_embed_page() ) {
+		if ( ! PageController::is_embed_page() ) {
 			return;
 		}
 		$version = Constants::get_constant( 'WC_VERSION' );
diff --git a/plugins/woocommerce/src/Admin/Features/Features.php b/plugins/woocommerce/src/Admin/Features/Features.php
index 0c7d36b845e..d522d630857 100644
--- a/plugins/woocommerce/src/Admin/Features/Features.php
+++ b/plugins/woocommerce/src/Admin/Features/Features.php
@@ -40,7 +40,6 @@ class Features {
 	protected static $beta_features = array(
 		'navigation',
 		'new-product-management-experience',
-		'product-block-editor',
 		'settings',
 	);
 
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/DeprecatedExtendedTask.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/DeprecatedExtendedTask.php
index c8375dc4ab1..f2e62fc96b7 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/DeprecatedExtendedTask.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/DeprecatedExtendedTask.php
@@ -76,7 +76,7 @@ class DeprecatedExtendedTask extends Task {
 	}
 
 	/**
-	 * Additonal info.
+	 * Additional info.
 	 *
 	 * @return string
 	 */
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php
index a2510fd6ed6..8385ee9865a 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/TaskLists.php
@@ -152,45 +152,6 @@ class TaskLists {
 				),
 			)
 		);
-		self::add_list(
-			array(
-				'id'           => 'setup_two_column',
-				'hidden_id'    => 'setup',
-				'title'        => __( 'Get ready to start selling', 'woocommerce' ),
-				'tasks'        => array(
-					'Products',
-					'WooCommercePayments',
-					'Payments',
-					'Tax',
-					'Shipping',
-					'Marketing',
-					'Appearance',
-				),
-				'event_prefix' => 'tasklist_',
-			)
-		);
-		self::add_list(
-			array(
-				'id'           => 'extended_two_column',
-				'hidden_id'    => 'extended',
-				'title'        => __( 'Things to do next', 'woocommerce' ),
-				'sort_by'      => array(
-					array(
-						'key'   => 'is_complete',
-						'order' => 'asc',
-					),
-					array(
-						'key'   => 'level',
-						'order' => 'asc',
-					),
-				),
-				'tasks'        => array(
-					'AdditionalPayments',
-					'GetMobileApp',
-				),
-				'event_prefix' => 'extended_tasklist_',
-			)
-		);
 
 		if ( Features::is_enabled( 'shipping-smart-defaults' ) ) {
 			self::add_task(
@@ -200,13 +161,6 @@ class TaskLists {
 				)
 			);
 
-			self::add_task(
-				'extended_two_column',
-				new ReviewShippingOptions(
-					self::get_list( 'extended_two_column' )
-				)
-			);
-
 			// Tasklist that will never be shown in homescreen,
 			// used for having tasks that are accessed by other means.
 			self::add_list(
@@ -225,7 +179,6 @@ class TaskLists {
 		if ( ! wp_is_mobile() ) { // Permit In-App Marketplace Tour on desktops only.
 			$tour_task = new TourInAppMarketplace();
 			self::add_task( 'extended', $tour_task );
-			self::add_task( 'extended_two_column', $tour_task );
 		}
 
 		if ( has_filter( 'woocommerce_admin_experimental_onboarding_tasklists' ) ) {
@@ -253,7 +206,7 @@ class TaskLists {
 	}
 
 	/**
-	 * Temporarily store the active task to persist across page loads when neccessary.
+	 * Temporarily store the active task to persist across page loads when necessary.
 	 * Most tasks do not need this.
 	 */
 	public static function set_active_task() {
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/AdditionalPayments.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/AdditionalPayments.php
index 9465bb3e94a..c3a346dda07 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/AdditionalPayments.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/AdditionalPayments.php
@@ -6,6 +6,7 @@ namespace Automattic\WooCommerce\Admin\Features\OnboardingTasks\Tasks;
 use Automattic\WooCommerce\Admin\Features\Features;
 use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Tasks\Payments;
 use Automattic\WooCommerce\Admin\Features\OnboardingTasks\Tasks\WooCommercePayments;
+use Automattic\WooCommerce\Admin\Features\PaymentGatewaySuggestions\Init;
 
 /**
  * Payments Task
@@ -14,10 +15,18 @@ class AdditionalPayments extends Payments {
 
 	/**
 	 * Used to cache is_complete() method result.
+	 *
 	 * @var null
 	 */
 	private $is_complete_result = null;
 
+	/**
+	 * Used to cache can_view() method result.
+	 *
+	 * @var null
+	 */
+	private $can_view_result = null;
+
 
 	/**
 	 * ID.
@@ -67,8 +76,8 @@ class AdditionalPayments extends Payments {
 	 * @return bool
 	 */
 	public function is_complete() {
-		if ( $this->is_complete_result === null ) {
-			$this->is_complete_result = self::has_gateways();
+		if ( null === $this->is_complete_result ) {
+			$this->is_complete_result = self::has_enabled_additional_gateways();
 		}
 
 		return $this->is_complete_result;
@@ -85,33 +94,102 @@ class AdditionalPayments extends Payments {
 			return false;
 		}
 
-		$woocommerce_payments = new WooCommercePayments();
-
-		if ( ! $woocommerce_payments->is_requested() || ! $woocommerce_payments->is_supported() || ! $woocommerce_payments->is_connected() ) {
-			// Hide task if WC Pay is not installed via OBW, or is not connected, or the store is located in a country that is not supported by WC Pay.
-			return false;
+		if ( null !== $this->can_view_result ) {
+			return $this->can_view_result;
 		}
-		if ( $this->get_parent_id() === 'extended_two_column' && WooCommercePayments::is_connected() ) {
+
+		// Show task if woocommerce-payments is connected or if there are any suggested gateways in other category enabled.
+		$this->can_view_result = (
+			WooCommercePayments::is_connected() ||
+			self::has_enabled_other_category_gateways()
+		);
+
+		// Early return if task is not visible.
+		if ( ! $this->can_view_result ) {
 			return false;
 		}
 
-		return true;
+		// Show task if there are any suggested gateways in additional category.
+		$this->can_view_result = ! empty( self::get_suggestion_gateways( 'category_additional' ) );
+
+		return $this->can_view_result;
 	}
 
+
 	/**
-	 * Check if the store has any enabled gateways.
+	 * Check if the store has any enabled gateways in other category.
 	 *
 	 * @return bool
 	 */
-	public static function has_gateways() {
+	private static function has_enabled_other_category_gateways() {
+		$other_gateways     = self::get_suggestion_gateways( 'category_other' );
+		$other_gateways_ids = wp_list_pluck( $other_gateways, 'id' );
+
+		return self::has_enabled_gateways(
+			function( $gateway ) use ( $other_gateways_ids ) {
+				return in_array( $gateway->id, $other_gateways_ids, true );
+			}
+		);
+	}
+
+	/**
+	 * Check if the store has any enabled gateways in additional category.
+	 *
+	 * @return bool
+	 */
+	private static function has_enabled_additional_gateways() {
+		$additional_gateways     = self::get_suggestion_gateways( 'category_additional' );
+		$additional_gateways_ids = wp_list_pluck( $additional_gateways, 'id' );
+
+		return self::has_enabled_gateways(
+			function( $gateway ) use ( $additional_gateways_ids ) {
+				return 'yes' === $gateway->enabled
+				&& in_array( $gateway->id, $additional_gateways_ids, true );
+			}
+		);
+	}
+
+	/**
+	 * Check if the store has any enabled gateways based on the given criteria.
+	 *
+	 * @param callable|null $filter A callback function to filter the gateways.
+	 * @return bool
+	 */
+	private static function has_enabled_gateways( $filter = null ) {
 		$gateways         = WC()->payment_gateways->get_available_payment_gateways();
 		$enabled_gateways = array_filter(
 			$gateways,
-			function( $gateway ) {
-				return 'yes' === $gateway->enabled && 'woocommerce_payments' !== $gateway->id;
+			function( $gateway ) use ( $filter ) {
+				if ( is_callable( $filter ) ) {
+					return 'yes' === $gateway->enabled && call_user_func( $filter, $gateway );
+				} else {
+					return 'yes' === $gateway->enabled;
+				}
 			}
 		);
 
 		return ! empty( $enabled_gateways );
 	}
+
+	/**
+	 * Get the list of gateways to suggest.
+	 *
+	 * @param string $filter_by Filter by category. "category_additional" or "category_other".
+	 *
+	 * @return array
+	 */
+	private static function get_suggestion_gateways( $filter_by = 'category_additional' ) {
+		$country            = wc_get_base_location()['country'];
+		$plugin_suggestions = Init::get_suggestions();
+		$plugin_suggestions = array_filter(
+			$plugin_suggestions,
+			function( $plugin ) use ( $country, $filter_by ) {
+				if ( ! isset( $plugin->{$filter_by} ) || ! isset( $plugin->plugins[0] ) ) {
+					return false;
+				}
+				return in_array( $country, $plugin->{$filter_by}, true );
+			}
+		);
+		return $plugin_suggestions;
+	}
 }
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Appearance.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Appearance.php
index cadd67a6d5b..2b2832bf635 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Appearance.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/Appearance.php
@@ -76,10 +76,11 @@ class Appearance extends Task {
 	 */
 	public function get_additional_data() {
 		return array(
-			'has_homepage' => self::has_homepage(),
-			'has_products' => Products::has_products(),
-			'stylesheet'   => get_option( 'stylesheet' ),
-			'theme_mods'   => get_theme_mods(),
+			'has_homepage'        => self::has_homepage(),
+			'has_products'        => Products::has_products(),
+			'stylesheet'          => get_option( 'stylesheet' ),
+			'theme_mods'          => get_theme_mods(),
+			'support_custom_logo' => false !== get_theme_support( 'custom-logo' ),
 		);
 	}
 
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/StoreDetails.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/StoreDetails.php
index 085a585bcf9..c8e650a8562 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/StoreDetails.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/StoreDetails.php
@@ -69,6 +69,16 @@ class StoreDetails extends Task {
 	 * @return bool
 	 */
 	public function is_complete() {
+		$country        = WC()->countries->get_base_country();
+		$country_locale = WC()->countries->get_country_locale();
+		$locale         = $country_locale[ $country ] ?? array();
+
+		$hide_postcode = $locale['postcode']['hidden'] ?? false;
+		// If postcode is hidden, just check that the store address and city are set.
+		if ( $hide_postcode ) {
+			return get_option( 'woocommerce_store_address', '' ) !== '' && get_option( 'woocommerce_store_city', '' ) !== '';
+		}
+
 		// Mark as completed if the store address, city and postcode are set. We don't need to check the country because it's set by default.
 		return get_option( 'woocommerce_store_address', '' ) !== '' && get_option( 'woocommerce_store_city', '' ) !== '' &&
 		get_option( 'woocommerce_store_postcode', '' ) !== '';
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php
index 9c7fc60ae38..858ddf4fb36 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Tasks/WooCommercePayments.php
@@ -12,6 +12,13 @@ use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskList;
  * WooCommercePayments Task
  */
 class WooCommercePayments extends Task {
+	/**
+	 * Used to cache is_complete() method result.
+	 *
+	 * @var null
+	 */
+	private $is_complete_result = null;
+
 	/**
 	 * ID.
 	 *
@@ -78,7 +85,11 @@ class WooCommercePayments extends Task {
 	 * @return bool
 	 */
 	public function is_complete() {
-		return self::is_connected();
+		if ( null === $this->is_complete_result ) {
+			$this->is_complete_result = self::is_connected();
+		}
+
+		return $this->is_complete_result;
 	}
 
 	/**
@@ -92,7 +103,7 @@ class WooCommercePayments extends Task {
 		return ! $payments->is_complete() && // Do not re-display the task if the "add payments" task has already been completed.
 			self::is_installed() &&
 			self::is_supported() &&
-			( $this->get_parent_id() !== 'setup_two_column' || ! self::is_connected() );
+			! self::is_connected();
 	}
 
 	/**
diff --git a/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/DefaultPaymentGateways.php b/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/DefaultPaymentGateways.php
index 9f96721ec96..da401f9099c 100644
--- a/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/DefaultPaymentGateways.php
+++ b/plugins/woocommerce/src/Admin/Features/PaymentGatewaySuggestions/DefaultPaymentGateways.php
@@ -317,8 +317,8 @@ class DefaultPaymentGateways {
 			),
 			array(
 				'id'                  => 'payfast',
-				'title'               => __( 'PayFast', 'woocommerce' ),
-				'content'             => __( 'The PayFast extension for WooCommerce enables you to accept payments by Credit Card and EFT via one of South Africa’s most popular payment gateways. No setup fees or monthly subscription costs. Selecting this extension will configure your store to use South African rands as the selected currency.', 'woocommerce' ),
+				'title'               => __( 'Payfast', 'woocommerce' ),
+				'content'             => __( 'The Payfast extension for WooCommerce enables you to accept payments by Credit Card and EFT via one of South Africa’s most popular payment gateways. No setup fees or monthly subscription costs. Selecting this extension will configure your store to use South African rands as the selected currency.', 'woocommerce' ),
 				'image'               => WC_ADMIN_IMAGES_FOLDER_URL . '/payfast.png',
 				'image_72x72'         => WC_ADMIN_IMAGES_FOLDER_URL . '/payment_methods/72x72/payfast.png',
 				'plugins'             => array( 'woocommerce-payfast-gateway' ),
diff --git a/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/BlockRegistry.php b/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/BlockRegistry.php
index e0c848166ef..6967b468545 100644
--- a/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/BlockRegistry.php
+++ b/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/BlockRegistry.php
@@ -31,10 +31,12 @@ class BlockRegistry {
 		'woocommerce/product-name-field',
 		'woocommerce/product-pricing-field',
 		'woocommerce/product-radio-field',
+		'woocommerce/product-regular-price-field',
+		'woocommerce/product-sale-price-field',
 		'woocommerce/product-schedule-sale-fields',
 		'woocommerce/product-section',
+		'woocommerce/product-shipping-class-field',
 		'woocommerce/product-shipping-dimensions-fields',
-		'woocommerce/product-shipping-fee-fields',
 		'woocommerce/product-summary-field',
 		'woocommerce/product-tab',
 		'woocommerce/product-inventory-quantity-field',
diff --git a/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php b/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php
index de000b2ce89..3c694f28a12 100644
--- a/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php
+++ b/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php
@@ -15,14 +15,6 @@ use WP_Block_Editor_Context;
  * Loads assets related to the product block editor.
  */
 class Init {
-
-	const FEATURE_ID = 'product-block-editor';
-
-	/**
-	 * Option name used to toggle this feature.
-	 */
-	const TOGGLE_OPTION_NAME = 'woocommerce_' . self::FEATURE_ID . '_enabled';
-
 	/**
 	 * The context name used to identify the editor.
 	 */
@@ -32,12 +24,13 @@ class Init {
 	 * Constructor
 	 */
 	public function __construct() {
-		if ( ! Features::is_enabled( 'new-product-management-experience' ) && Features::is_enabled( self::FEATURE_ID ) ) {
-			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-			add_action( 'get_edit_post_link', array( $this, 'update_edit_product_link' ), 10, 2 );
-		}
-		if ( Features::is_enabled( self::FEATURE_ID ) ) {
+		if ( \Automattic\WooCommerce\Utilities\FeaturesUtil::feature_is_enabled( 'product_block_editor' ) ) {
+			if ( ! Features::is_enabled( 'new-product-management-experience' ) ) {
+				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+				add_action( 'get_edit_post_link', array( $this, 'update_edit_product_link' ), 10, 2 );
+			}
 			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+			add_filter( 'woocommerce_register_post_type_product', array( $this, 'add_product_template' ) );
 			$block_registry = new BlockRegistry();
 			$block_registry->init();
 		}
@@ -75,6 +68,7 @@ class Init {
 			sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( $editor_settings['blockCategories'] ) ),
 			'before'
 		);
+		wp_tinymce_inline_scripts();
 	}
 
 	/**
@@ -215,4 +209,443 @@ class Init {
 		);
 	}
 
+	/**
+	 * Enqueue styles needed for the rich text editor.
+	 *
+	 * @param array $args Array of post type arguments.
+	 * @return array Array of post type arguments.
+	 */
+	public function add_product_template( $args ) {
+		if ( ! isset( $args['template'] ) ) {
+			$args['template_lock'] = 'all';
+			$args['template']      = array(
+				array(
+					'woocommerce/product-tab',
+					array(
+						'id'    => 'general',
+						'title' => __( 'General', 'woocommerce' ),
+						'order' => 10,
+					),
+					array(
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Basic details', 'woocommerce' ),
+								'description' => __( 'This info will be displayed on the product page, category pages, social media, and search results.', 'woocommerce' ),
+							),
+							array(
+								array(
+									'woocommerce/product-name-field',
+									array(
+										'name' => 'Product name',
+									),
+								),
+								array(
+									'woocommerce/product-summary-field',
+								),
+								array(
+									'core/columns',
+									array(),
+									array(
+										array(
+											'core/column',
+											array(
+												'templateLock' => 'all',
+											),
+											array(
+												array(
+													'woocommerce/product-regular-price-field',
+													array(
+														'name'  => 'regular_price',
+														'label' => __( 'List price', 'woocommerce' ),
+														'help'  => __( 'Manage more settings in <PricingTab>Pricing.</PricingTab>', 'woocommerce' ),
+													),
+												),
+											),
+										),
+										array(
+											'core/column',
+											array(
+												'templateLock' => 'all',
+											),
+											array(
+												array(
+													'woocommerce/product-sale-price-field',
+													array(
+														'label' => __( 'Sale price', 'woocommerce' ),
+													),
+												),
+											),
+										),
+									),
+								),
+							),
+						),
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Description', 'woocommerce' ),
+								'description' => __( 'What makes this product unique? What are its most important features? Enrich the product page by adding rich content using blocks.', 'woocommerce' ),
+							),
+							array(
+								array(
+									'woocommerce/product-description-field',
+								),
+							),
+						),
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Images', 'woocommerce' ),
+								'description' => sprintf(
+									/* translators: %1$s: Images guide link opening tag. %2$s: Images guide link closing tag.*/
+									__( 'Drag images, upload new ones or select files from your library. For best results, use JPEG files that are 1000 by 1000 pixels or larger. %1$sHow to prepare images?%2$s', 'woocommerce' ),
+									'<a href="http://woocommerce.com/#" target="_blank" rel="noreferrer">',
+									'</a>'
+								),
+							),
+							array(
+								array(
+									'woocommerce/product-images-field',
+									array(
+										'images' => array(),
+									),
+								),
+							),
+						),
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Organization & visibility', 'woocommerce' ),
+								'description' => __( 'Help customers find this product by assigning it to categories or featuring it across your sales channels.', 'woocommerce' ),
+							),
+							array(
+								array(
+									'woocommerce/product-category-field',
+									array(
+										'name' => 'categories',
+									),
+								),
+							),
+						),
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Attributes', 'woocommerce' ),
+								'description' => sprintf(
+									/* translators: %1$s: Attributes guide link opening tag. %2$s: Attributes guide link closing tag.*/
+									__( 'Add descriptive pieces of information that customers can use to filter and search for this product. %1$sLearn more%2$s', 'woocommerce' ),
+									'<a href="https://woocommerce.com/document/managing-product-taxonomies/#product-attributes" target="_blank" rel="noreferrer">',
+									'</a>'
+								),
+							),
+							array(
+								array(
+									'woocommerce/product-attributes-field',
+								),
+							),
+						),
+					),
+				),
+				array(
+					'woocommerce/product-tab',
+					array(
+						'id'    => 'pricing',
+						'title' => __( 'Pricing', 'woocommerce' ),
+						'order' => 20,
+					),
+					array(
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Pricing', 'woocommerce' ),
+								'description' => sprintf(
+									/* translators: %1$s: Images guide link opening tag. %2$s: Images guide link closing tag.*/
+									__( 'Set a competitive price, put the product on sale, and manage tax calculations. %1$sHow to price your product?%2$s', 'woocommerce' ),
+									'<a href="https://woocommerce.com/posts/how-to-price-products-strategies-expert-tips/" target="_blank" rel="noreferrer">',
+									'</a>'
+								),
+							),
+							array(
+								array(
+									'core/columns',
+									array(),
+									array(
+										array(
+											'core/column',
+											array(
+												'templateLock' => 'all',
+											),
+											array(
+												array(
+													'woocommerce/product-regular-price-field',
+													array(
+														'name'  => 'regular_price',
+														'label' => __( 'List price', 'woocommerce' ),
+													),
+												),
+											),
+										),
+										array(
+											'core/column',
+											array(
+												'templateLock' => 'all',
+											),
+											array(
+												array(
+													'woocommerce/product-sale-price-field',
+													array(
+														'label' => __( 'Sale price', 'woocommerce' ),
+													),
+												),
+											),
+										),
+									),
+								),
+								array(
+									'woocommerce/product-schedule-sale-fields',
+								),
+								array(
+									'woocommerce/product-radio-field',
+									array(
+										'title'    => __( 'Charge sales tax on', 'woocommerce' ),
+										'property' => 'tax_status',
+										'options'  => array(
+											array(
+												'label' => __( 'Product and shipping', 'woocommerce' ),
+												'value' => 'taxable',
+											),
+											array(
+												'label' => __( 'Only shipping', 'woocommerce' ),
+												'value' => 'shipping',
+											),
+											array(
+												'label' => __( "Don't charge tax", 'woocommerce' ),
+												'value' => 'none',
+											),
+										),
+									),
+								),
+								array(
+									'woocommerce/product-collapsible',
+									array(
+										'toggleText'       => __( 'Advanced', 'woocommerce' ),
+										'initialCollapsed' => true,
+										'persistRender'    => true,
+									),
+									array(
+										array(
+											'woocommerce/product-radio-field',
+											array(
+												'title'    => __( 'Tax class', 'woocommerce' ),
+												'description' => sprintf(
+													/* translators: %1$s: Learn more link opening tag. %2$s: Learn more link closing tag.*/
+													__( 'Apply a tax rate if this product qualifies for tax reduction or exemption. %1$sLearn more%2$s.', 'woocommerce' ),
+													'<a href="https://woocommerce.com/document/setting-up-taxes-in-woocommerce/#shipping-tax-class" target="_blank" rel="noreferrer">',
+													'</a>'
+												),
+												'property' => 'tax_class',
+												'options'  => array(
+													array(
+														'label' => __( 'Standard', 'woocommerce' ),
+														'value' => '',
+													),
+													array(
+														'label' => __( 'Reduced rate', 'woocommerce' ),
+														'value' => 'reduced-rate',
+													),
+													array(
+														'label' => __( 'Zero rate', 'woocommerce' ),
+														'value' => 'zero-rate',
+													),
+												),
+											),
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+				array(
+					'woocommerce/product-tab',
+					array(
+						'id'    => 'inventory',
+						'title' => __( 'Inventory', 'woocommerce' ),
+						'order' => 30,
+					),
+					array(
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Inventory', 'woocommerce' ),
+								'description' => sprintf(
+									/* translators: %1$s: Inventory settings link opening tag. %2$s: Inventory settings link closing tag.*/
+									__( 'Set up and manage inventory for this product, including status and available quantity. %1$sManage store inventory settings%2$s', 'woocommerce' ),
+									'<a href="' . admin_url( 'admin.php?page=wc-settings&tab=products&section=inventory' ) . '" target="_blank" rel="noreferrer">',
+									'</a>'
+								),
+							),
+							array(
+								array(
+									'woocommerce/product-sku-field',
+								),
+								array(
+									'woocommerce/product-toggle-field',
+									array(
+										'label'    => __( 'Track stock quantity for this product', 'woocommerce' ),
+										'property' => 'manage_stock',
+										'disabled' => 'yes' !== get_option( 'woocommerce_manage_stock' ),
+									),
+								),
+								array(
+									'woocommerce/conditional',
+									array(
+										'mustMatch' => array(
+											'manage_stock' => array( true ),
+										),
+									),
+									array(
+										array(
+											'woocommerce/product-inventory-quantity-field',
+										),
+									),
+								),
+								array(
+									'woocommerce/conditional',
+									array(
+										'mustMatch' => array(
+											'manage_stock' => array( false ),
+										),
+									),
+									array(
+										array(
+											'woocommerce/product-radio-field',
+											array(
+												'title'    => __( 'Stock status', 'woocommerce' ),
+												'property' => 'stock_status',
+												'options'  => array(
+													array(
+														'label' => __( 'In stock', 'woocommerce' ),
+														'value' => 'instock',
+													),
+													array(
+														'label' => __( 'Out of stock', 'woocommerce' ),
+														'value' => 'outofstock',
+													),
+													array(
+														'label' => __( 'On backorder', 'woocommerce' ),
+														'value' => 'onbackorder',
+													),
+												),
+											),
+										),
+									),
+								),
+								array(
+									'woocommerce/product-collapsible',
+									array(
+										'toggleText'       => __( 'Advanced', 'woocommerce' ),
+										'initialCollapsed' => true,
+										'persistRender'    => true,
+									),
+									array(
+										array(
+											'woocommerce/conditional',
+											array(
+												'mustMatch' => array(
+													'manage_stock' => array( true ),
+												),
+											),
+											array(
+												array(
+													'woocommerce/product-radio-field',
+													array(
+														'title'    => __( 'When out of stock', 'woocommerce' ),
+														'property' => 'backorders',
+														'options'  => array(
+															array(
+																'label' => __( 'Allow purchases', 'woocommerce' ),
+																'value' => 'yes',
+															),
+															array(
+																'label' => __(
+																	'Allow purchases, but notify customers',
+																	'woocommerce'
+																),
+																'value' => 'notify',
+															),
+															array(
+																'label' => __( "Don't allow purchases", 'woocommerce' ),
+																'value' => 'no',
+															),
+														),
+													),
+												),
+												array(
+													'woocommerce/product-inventory-email-field',
+												),
+											),
+										),
+										array(
+											'woocommerce/product-checkbox-field',
+											array(
+												'title'    => __(
+													'Restrictions',
+													'woocommerce'
+												),
+												'label'    => __(
+													'Limit purchases to 1 item per order',
+													'woocommerce'
+												),
+												'property' => 'sold_individually',
+												'tooltip'  => __(
+													'When checked, customers will be able to purchase only 1 item in a single order. This is particularly useful for items that have limited quantity, like art or handmade goods.',
+													'woocommerce'
+												),
+											),
+										),
+
+									),
+								),
+
+							),
+						),
+					),
+
+				),
+				array(
+					'woocommerce/product-tab',
+					array(
+						'id'    => 'shipping',
+						'title' => __( 'Shipping', 'woocommerce' ),
+						'order' => 40,
+					),
+					array(
+						array(
+							'woocommerce/product-section',
+							array(
+								'title'       => __( 'Fees & dimensions', 'woocommerce' ),
+								'description' => sprintf(
+									/* translators: %1$s: How to get started? link opening tag. %2$s: How to get started? link closing tag.*/
+									__( 'Set up shipping costs and enter dimensions used for accurate rate calculations. %1$sHow to get started?%2$s.', 'woocommerce' ),
+									'<a href="https://woocommerce.com/posts/how-to-calculate-shipping-costs-for-your-woocommerce-store/" target="_blank" rel="noreferrer">',
+									'</a>'
+								),
+							),
+							array(
+								array(
+									'woocommerce/product-shipping-class-field',
+								),
+								array(
+									'woocommerce/product-shipping-dimensions-fields',
+								),
+							),
+						),
+					),
+				),
+			);
+		}
+		return $args;
+	}
 }
diff --git a/plugins/woocommerce/src/Admin/Notes/DataStore.php b/plugins/woocommerce/src/Admin/Notes/DataStore.php
index d128edd8065..1e7f735123d 100644
--- a/plugins/woocommerce/src/Admin/Notes/DataStore.php
+++ b/plugins/woocommerce/src/Admin/Notes/DataStore.php
@@ -391,7 +391,7 @@ class DataStore extends \WC_Data_Store_WP implements \WC_Object_Data_Store_Inter
 	 * @param string $type Comma separated list of note types.
 	 * @param string $status Comma separated list of statuses.
 	 * @param string $context Optional argument that the woocommerce_note_where_clauses filter can use to determine whether to apply extra conditions. Extensions should define their own contexts and use them to avoid adding to notes where clauses when not needed.
-	 * @return array An array of objects containing a note id.
+	 * @return string Count of objects with given type, status and context.
 	 */
 	public function get_notes_count( $type = array(), $status = array(), $context = self::WC_ADMIN_NOTE_OPER_GLOBAL ) {
 		global $wpdb;
diff --git a/plugins/woocommerce/src/Admin/PluginsHelper.php b/plugins/woocommerce/src/Admin/PluginsHelper.php
index 3f9e41a380a..414b1cd1327 100644
--- a/plugins/woocommerce/src/Admin/PluginsHelper.php
+++ b/plugins/woocommerce/src/Admin/PluginsHelper.php
@@ -7,6 +7,16 @@
 
 namespace Automattic\WooCommerce\Admin;
 
+use ActionScheduler;
+use ActionScheduler_DBStore;
+use ActionScheduler_QueueRunner;
+use Automatic_Upgrader_Skin;
+use Automattic\WooCommerce\Admin\PluginsInstallLoggers\AsyncPluginsInstallLogger;
+use Automattic\WooCommerce\Admin\PluginsInstallLoggers\PluginsInstallLogger;
+use Plugin_Upgrader;
+use WP_Error;
+use WP_Upgrader;
+
 defined( 'ABSPATH' ) || exit;
 
 if ( ! function_exists( 'get_plugins' ) ) {
@@ -23,6 +33,7 @@ class PluginsHelper {
 	 */
 	public static function init() {
 		add_action( 'woocommerce_plugins_install_callback', array( __CLASS__, 'install_plugins' ), 10, 2 );
+		add_action( 'woocommerce_plugins_install_async_callback', array( __CLASS__, 'install_plugins_async_callback' ), 10, 2 );
 		add_action( 'woocommerce_plugins_activate_callback', array( __CLASS__, 'activate_plugins' ), 10, 2 );
 	}
 
@@ -60,8 +71,9 @@ class PluginsHelper {
 	 */
 	public static function get_installed_plugin_slugs() {
 		return array_map(
-			function( $plugin_path ) {
+			function ( $plugin_path ) {
 				$path_parts = explode( '/', $plugin_path );
+
 				return $path_parts[0];
 			},
 			array_keys( get_plugins() )
@@ -93,8 +105,9 @@ class PluginsHelper {
 	 */
 	public static function get_active_plugin_slugs() {
 		return array_map(
-			function( $plugin_path ) {
+			function ( $plugin_path ) {
 				$path_parts = explode( '/', $plugin_path );
+
 				return $path_parts[0];
 			},
 			get_option( 'active_plugins', array() )
@@ -110,6 +123,7 @@ class PluginsHelper {
 	 */
 	public static function is_plugin_installed( $plugin ) {
 		$plugin_path = self::get_plugin_path_from_slug( $plugin );
+
 		return $plugin_path ? array_key_exists( $plugin_path, get_plugins() ) : false;
 	}
 
@@ -122,6 +136,7 @@ class PluginsHelper {
 	 */
 	public static function is_plugin_active( $plugin ) {
 		$plugin_path = self::get_plugin_path_from_slug( $plugin );
+
 		return $plugin_path ? in_array( $plugin_path, get_option( 'active_plugins', array() ), true ) : false;
 	}
 
@@ -142,20 +157,26 @@ class PluginsHelper {
 	/**
 	 * Install an array of plugins.
 	 *
-	 * @param array $plugins Plugins to install.
+	 * @param array                     $plugins Plugins to install.
+	 * @param PluginsInstallLogger|null $logger an optional logger.
+	 *
 	 * @return array
 	 */
-	public static function install_plugins( $plugins ) {
+	public static function install_plugins( $plugins, PluginsInstallLogger $logger = null ) {
 		/**
 		 * Filter the list of plugins to install.
 		 *
 		 * @param array $plugins A list of the plugins to install.
+		 *
 		 * @since 6.4.0
 		 */
 		$plugins = apply_filters( 'woocommerce_admin_plugins_pre_install', $plugins );
 
 		if ( empty( $plugins ) || ! is_array( $plugins ) ) {
-			return new \WP_Error( 'woocommerce_plugins_invalid_plugins', __( 'Plugins must be a non-empty array.', 'woocommerce' ) );
+			return new WP_Error(
+				'woocommerce_plugins_invalid_plugins',
+				__( 'Plugins must be a non-empty array.', 'woocommerce' )
+			);
 		}
 
 		require_once ABSPATH . 'wp-admin/includes/plugin.php';
@@ -169,13 +190,15 @@ class PluginsHelper {
 		$installed_plugins = array();
 		$results           = array();
 		$time              = array();
-		$errors            = new \WP_Error();
+		$errors            = new WP_Error();
 
 		foreach ( $plugins as $plugin ) {
 			$slug = sanitize_key( $plugin );
+			$logger && $logger->install_requested( $plugin );
 
 			if ( isset( $existing_plugins[ $slug ] ) ) {
 				$installed_plugins[] = $plugin;
+				$logger && $logger->installed( $plugin, 0 );
 				continue;
 			}
 
@@ -193,8 +216,14 @@ class PluginsHelper {
 
 			if ( is_wp_error( $api ) ) {
 				$properties = array(
-					/* translators: %s: plugin slug (example: woocommerce-services) */
-					'error_message'     => sprintf( __( 'The requested plugin `%s` could not be installed. Plugin API call failed.', 'woocommerce' ), $slug ),
+					'error_message'     => sprintf(
+						// translators: %s: plugin slug (example: woocommerce-services).
+						__(
+							'The requested plugin `%s` could not be installed. Plugin API call failed.',
+							'woocommerce'
+						),
+						$slug
+					),
 					'api_error_message' => $api->get_error_message(),
 					'slug'              => $slug,
 				);
@@ -204,32 +233,40 @@ class PluginsHelper {
 				 * Action triggered when a plugin API call failed.
 				 *
 				 * @param string $slug The plugin slug.
-				 * @param \WP_Error $api The API response.
+				 * @param WP_Error $api The API response.
+				 *
 				 * @since 6.4.0
 				 */
 				do_action( 'woocommerce_plugins_install_api_error', $slug, $api );
 
-				$errors->add(
-					$plugin,
-					sprintf(
-						/* translators: %s: plugin slug (example: woocommerce-services) */
-						__( 'The requested plugin `%s` could not be installed. Plugin API call failed.', 'woocommerce' ),
-						$slug
-					)
+				$error_message = sprintf(
+				/* translators: %s: plugin slug (example: woocommerce-services) */
+					__( 'The requested plugin `%s` could not be installed. Plugin API call failed.', 'woocommerce' ),
+					$slug
 				);
 
+				$errors->add( $plugin, $error_message );
+				$logger && $logger->add_error( $plugin, $error_message );
+
 				continue;
 			}
 
-			$upgrader           = new \Plugin_Upgrader( new \Automatic_Upgrader_Skin() );
-			$result             = $upgrader->install( $api->download_link );
+			$upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
+			$result   = $upgrader->install( $api->download_link );
+			// result can be false or WP_Error.
 			$results[ $plugin ] = $result;
 			$time[ $plugin ]    = round( ( microtime( true ) - $start_time ) * 1000 );
 
 			if ( is_wp_error( $result ) || is_null( $result ) ) {
 				$properties = array(
-					/* translators: %s: plugin slug (example: woocommerce-services) */
-					'error_message'         => sprintf( __( 'The requested plugin `%s` could not be installed.', 'woocommerce' ), $slug ),
+					'error_message'         => sprintf(
+						/* translators: %s: plugin slug (example: woocommerce-services) */
+						__(
+							'The requested plugin `%s` could not be installed.',
+							'woocommerce'
+						),
+						$slug
+					),
 					'slug'                  => $slug,
 					'api_version'           => $api->version,
 					'api_download_link'     => $api->download_link,
@@ -243,26 +280,33 @@ class PluginsHelper {
 				 *
 				 * @param string $slug The plugin slug.
 				 * @param object $api The plugin API object.
-				 * @param \WP_Error|null $result The result of the plugin installation.
-				 * @param \Plugin_Upgrader $upgrader The plugin upgrader.
+				 * @param WP_Error|null $result The result of the plugin installation.
+				 * @param Plugin_Upgrader $upgrader The plugin upgrader.
+				 *
 				 * @since 6.4.0
-				*/
+				 */
 				do_action( 'woocommerce_plugins_install_error', $slug, $api, $result, $upgrader );
 
+				$install_error_message = sprintf(
+				/* translators: %s: plugin slug (example: woocommerce-services) */
+					__( 'The requested plugin `%s` could not be installed. Upgrader install failed.', 'woocommerce' ),
+					$slug
+				);
 				$errors->add(
 					$plugin,
-					sprintf(
-						/* translators: %s: plugin slug (example: woocommerce-services) */
-						__( 'The requested plugin `%s` could not be installed. Upgrader install failed.', 'woocommerce' ),
-						$slug
-					)
+					$install_error_message
 				);
+				$logger && $logger->add_error( $plugin, $install_error_message );
+
 				continue;
 			}
 
 			$installed_plugins[] = $plugin;
+			$logger && $logger->installed( $plugin, $time[ $plugin ] );
 		}
 
+		$logger && $logger->complete();
+
 		$data = array(
 			'installed' => $installed_plugins,
 			'results'   => $results,
@@ -273,19 +317,40 @@ class PluginsHelper {
 		return $data;
 	}
 
+	/**
+	 * Callback regsitered by OnboardingPlugins::install_async.
+	 *
+	 * It is used to call install_plugins with a custom logger.
+	 *
+	 * @param array  $plugins A list of plugins to install.
+	 * @param string $job_id An unique job I.D.
+	 * @return bool
+	 */
+	public function install_plugins_async_callback( array $plugins, string $job_id ) {
+		$option_name = 'woocommerce_onboarding_plugins_install_async_' . $job_id;
+		$logger      = new AsyncPluginsInstallLogger( $option_name );
+		self::install_plugins( $plugins, $logger );
+		return true;
+	}
+
 	/**
 	 * Schedule plugin installation.
 	 *
 	 * @param array $plugins Plugins to install.
+	 *
 	 * @return string Job ID.
 	 */
 	public static function schedule_install_plugins( $plugins ) {
 		if ( empty( $plugins ) || ! is_array( $plugins ) ) {
-			return new \WP_Error( 'woocommerce_plugins_invalid_plugins', __( 'Plugins must be a non-empty array.', 'woocommerce' ), 404 );
+			return new WP_Error(
+				'woocommerce_plugins_invalid_plugins',
+				__( 'Plugins must be a non-empty array.', 'woocommerce' ),
+				404
+			);
 		}
 
 		$job_id = uniqid();
-		WC()->queue()->schedule_single( time() + 5, 'woocommerce_plugins_install_callback', array( $plugins, $job_id ) );
+		WC()->queue()->schedule_single( time() + 5, 'woocommerce_plugins_install_callback', array( $plugins ) );
 
 		return $job_id;
 	}
@@ -294,11 +359,16 @@ class PluginsHelper {
 	 * Activate the requested plugins.
 	 *
 	 * @param array $plugins Plugins.
+	 *
 	 * @return WP_Error|array Plugin Status
 	 */
 	public static function activate_plugins( $plugins ) {
 		if ( empty( $plugins ) || ! is_array( $plugins ) ) {
-			return new \WP_Error( 'woocommerce_plugins_invalid_plugins', __( 'Plugins must be a non-empty array.', 'woocommerce' ), 404 );
+			return new WP_Error(
+				'woocommerce_plugins_invalid_plugins',
+				__( 'Plugins must be a non-empty array.', 'woocommerce' ),
+				404
+			);
 		}
 
 		require_once ABSPATH . 'wp-admin/includes/plugin.php';
@@ -310,12 +380,13 @@ class PluginsHelper {
 		 * Filter the list of plugins to activate.
 		 *
 		 * @param array $plugins A list of the plugins to activate.
+		 *
 		 * @since 6.4.0
 		 */
 		$plugins = apply_filters( 'woocommerce_admin_plugins_pre_activate', $plugins );
 
 		$plugin_paths      = self::get_installed_plugins_paths();
-		$errors            = new \WP_Error();
+		$errors            = new WP_Error();
 		$activated_plugins = array();
 
 		foreach ( $plugins as $plugin ) {
@@ -337,7 +408,8 @@ class PluginsHelper {
 				 * Action triggered when a plugin activation fails.
 				 *
 				 * @param string $slug The plugin slug.
-				 * @param null|\WP_Error $result The result of the plugin activation.
+				 * @param null|WP_Error $result The result of the plugin activation.
+				 *
 				 * @since 6.4.0
 				 */
 				do_action( 'woocommerce_plugins_activate_error', $slug, $result );
@@ -366,15 +438,24 @@ class PluginsHelper {
 	 * Schedule plugin activation.
 	 *
 	 * @param array $plugins Plugins to activate.
+	 *
 	 * @return string Job ID.
 	 */
 	public static function schedule_activate_plugins( $plugins ) {
 		if ( empty( $plugins ) || ! is_array( $plugins ) ) {
-			return new \WP_Error( 'woocommerce_plugins_invalid_plugins', __( 'Plugins must be a non-empty array.', 'woocommerce' ), 404 );
+			return new WP_Error(
+				'woocommerce_plugins_invalid_plugins',
+				__( 'Plugins must be a non-empty array.', 'woocommerce' ),
+				404
+			);
 		}
 
 		$job_id = uniqid();
-		WC()->queue()->schedule_single( time() + 5, 'woocommerce_plugins_activate_callback', array( $plugins, $job_id ) );
+		WC()->queue()->schedule_single(
+			time() + 5,
+			'woocommerce_plugins_activate_callback',
+			array( $plugins, $job_id )
+		);
 
 		return $job_id;
 	}
@@ -383,6 +464,7 @@ class PluginsHelper {
 	 * Installation status.
 	 *
 	 * @param int $job_id Job ID.
+	 *
 	 * @return array Job data.
 	 */
 	public static function get_installation_status( $job_id = null ) {
@@ -402,14 +484,14 @@ class PluginsHelper {
 	 * Gets the plugin data for the first action.
 	 *
 	 * @param array $actions Array of AS actions.
+	 *
 	 * @return array Array of action data.
 	 */
 	public static function get_action_data( $actions ) {
-		$data = [];
+		$data = array();
 
 		foreach ( $actions as $action_id => $action ) {
-			$store  = new \ActionScheduler_DBStore();
-			$status = $store->get_status( $action_id );
+			$store  = new ActionScheduler_DBStore();
 			$args   = $action->get_args();
 			$data[] = array(
 				'job_id'  => $args[1],
@@ -425,6 +507,7 @@ class PluginsHelper {
 	 * Activation status.
 	 *
 	 * @param int $job_id Job ID.
+	 *
 	 * @return array Array of action data.
 	 */
 	public static function get_activation_status( $job_id = null ) {
diff --git a/plugins/woocommerce/src/Admin/PluginsInstallLoggers/AsynPluginsInstallLogger.php b/plugins/woocommerce/src/Admin/PluginsInstallLoggers/AsynPluginsInstallLogger.php
new file mode 100644
index 00000000000..306aeccf898
--- /dev/null
+++ b/plugins/woocommerce/src/Admin/PluginsInstallLoggers/AsynPluginsInstallLogger.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Automattic\WooCommerce\Admin\PluginsInstallLoggers;
+
+/**
+ * A logger to log plugin installation progress in real time to an option.
+ */
+class AsyncPluginsInstallLogger implements PluginsInstallLogger {
+
+	/**
+	 * Variable to store logs.
+	 *
+	 * @var string $option_name option name to store logs.
+	 */
+	private $option_name;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $option_name option name.
+	 */
+	public function __construct( string $option_name ) {
+		$this->option_name = $option_name;
+		add_option(
+			$this->option_name,
+			array(
+				'created_time' => time(),
+				'status'       => 'pending',
+				'plugins'      => array(),
+			),
+			'',
+			'no'
+		);
+
+		// Set status as failed in case we run out of exectuion time.
+		register_shutdown_function(
+			function () {
+				$error = error_get_last();
+				if ( isset( $error['type'] ) && E_ERROR === $error['type'] ) {
+					$option           = $this->get();
+					$option['status'] = 'failed';
+					$this->update( $option );
+				}
+			}
+		);
+	}
+
+	/**
+	 * Update the option.
+	 *
+	 * @param array $data New data.
+	 *
+	 * @return bool
+	 */
+	private function update( array $data ) {
+		return update_option( $this->option_name, $data );
+	}
+
+	/**
+	 * Retreive the option.
+	 *
+	 * @return false|mixed|void
+	 */
+	private function get() {
+		return get_option( $this->option_name );
+	}
+
+	/**
+	 * Add requested plugin.
+	 *
+	 * @param string $plugin_name plugin name.
+	 *
+	 * @return void
+	 */
+	public function install_requested( string $plugin_name ) {
+		$option = $this->get();
+		if ( ! isset( $option['plugins'][ $plugin_name ] ) ) {
+			$option['plugins'][ $plugin_name ] = array(
+				'status'           => 'installing',
+				'errors'           => array(),
+				'install_duration' => 0,
+			);
+		}
+		$this->update( $option );
+	}
+
+	/**
+	 * Add installed plugin.
+	 *
+	 * @param string $plugin_name plugin name.
+	 * @param int    $duration time took to install plugin.
+	 *
+	 * @return void
+	 */
+	public function installed( string $plugin_name, int $duration ) {
+		$option = $this->get();
+
+		$option['plugins'][ $plugin_name ]['status']           = 'installed';
+		$option['plugins'][ $plugin_name ]['install_duration'] = $duration;
+		$this->update( $option );
+	}
+
+	/**
+	 * Add an error.
+	 *
+	 * @param string      $plugin_name plugin name.
+	 * @param string|null $error_message error message.
+	 *
+	 * @return void
+	 */
+	public function add_error( string $plugin_name, string $error_message = null ) {
+		$option = $this->get();
+
+		$option['plugins'][ $plugin_name ]['errors'][] = $error_message;
+		$option['plugins'][ $plugin_name ]['status']   = 'failed';
+		$option['status']                              = 'failed';
+
+		$this->update( $option );
+	}
+
+	/**
+	 * Record completed_time.
+	 *
+	 * @return void
+	 */
+	public function complete() {
+		$option = $this->get();
+
+		$option['complete_time'] = time();
+		$option['status']        = 'complete';
+
+		$this->update( $option );
+	}
+}
diff --git a/plugins/woocommerce/src/Admin/PluginsInstallLoggers/PluginsInstallLogger.php b/plugins/woocommerce/src/Admin/PluginsInstallLoggers/PluginsInstallLogger.php
new file mode 100644
index 00000000000..0ef3ddc4655
--- /dev/null
+++ b/plugins/woocommerce/src/Admin/PluginsInstallLoggers/PluginsInstallLogger.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Automattic\WooCommerce\Admin\PluginsInstallLoggers;
+
+/**
+ * A logger used in PluginsHelper::install_plugins to log the installation progress.
+ */
+interface PluginsInstallLogger {
+
+	/**
+	 * Called when a plugin install requested.
+	 *
+	 * @param string $plugin_name plugin name.
+	 * @return mixed
+	 */
+	public function install_requested( string $plugin_name );
+
+	/**
+	 * Called when a plugin installed successfully.
+	 *
+	 * @param string $plugin_name plugin name.
+	 * @param int    $duration # of seconds it took to install $plugin_name.
+	 * @return mixed
+	 */
+	public function installed( string $plugin_name, int $duration);
+
+	/**
+	 * Called when an error occurred while installing a plugin.
+	 *
+	 * @param string      $plugin_name plugin name.
+	 * @param string|null $error_message error message.
+	 * @return mixed
+	 */
+	public function add_error( string $plugin_name, string $error_message = null);
+
+	/**
+	 * Called when all plugins are processed.
+	 *
+	 * @return mixed
+	 */
+	public function complete();
+}
+
diff --git a/plugins/woocommerce/src/Admin/RemoteInboxNotifications/RemoteInboxNotificationsEngine.php b/plugins/woocommerce/src/Admin/RemoteInboxNotifications/RemoteInboxNotificationsEngine.php
index c0372acb429..8365a2f0a24 100644
--- a/plugins/woocommerce/src/Admin/RemoteInboxNotifications/RemoteInboxNotificationsEngine.php
+++ b/plugins/woocommerce/src/Admin/RemoteInboxNotifications/RemoteInboxNotificationsEngine.php
@@ -40,19 +40,20 @@ class RemoteInboxNotificationsEngine {
 
 		// Hook into WCA updated. This is hooked up here rather than in
 		// on_admin_init because that runs too late to hook into the action.
+		add_action( 'woocommerce_run_on_woocommerce_admin_updated', array( __CLASS__, 'run_on_woocommerce_admin_updated' ) );
 		add_action(
 			'woocommerce_updated',
 			function() {
 				$next_hook = WC()->queue()->get_next(
 					'woocommerce_run_on_woocommerce_admin_updated',
-					array( __CLASS__, 'run_on_woocommerce_admin_updated' ),
+					array(),
 					'woocommerce-remote-inbox-engine'
 				);
 				if ( null === $next_hook ) {
 					WC()->queue()->schedule_single(
 						time(),
 						'woocommerce_run_on_woocommerce_admin_updated',
-						array( __CLASS__, 'run_on_woocommerce_admin_updated' ),
+						array(),
 						'woocommerce-remote-inbox-engine'
 					);
 				}
diff --git a/plugins/woocommerce/src/Admin/RemoteInboxNotifications/Transformers/README.md b/plugins/woocommerce/src/Admin/RemoteInboxNotifications/Transformers/README.md
index 96c8a5017d5..069764905b9 100644
--- a/plugins/woocommerce/src/Admin/RemoteInboxNotifications/Transformers/README.md
+++ b/plugins/woocommerce/src/Admin/RemoteInboxNotifications/Transformers/README.md
@@ -2,9 +2,9 @@
 
 An option transformer is a class that transforms the given option value into a different value for the comparison operation.
 
-Transformers run in the order they are defined. Each transformer passes down the value it transformed to the next transformer to consume.
+Transformers run in the order in which they are defined, and each transformer passes down the value it transformed to the next transformer for consumption.
 
-Definition example:
+**Definition example**: transformers are always used with `option` rule.
 
 ```
   {
@@ -37,17 +37,17 @@ Definition example:
   }
 ```
 
-### ArrayColumn (array_column)
+## array_column
 
-This uses PHP's built-in `array_column` to select values by a given array key.
+PHP's built-in `array_column` to select values from a single column. For more information about how array_column works, please see PHP's [official documentation](https://www.php.net/manual/en/function.array-column.php).
 
-Arguments:
+#### Arguments:
 
 | name | description    |
 | ---- | -------------- |
 | key  | array key name |
 
-Definition:
+#### Definition:
 
 ```php
 "transformers": [
@@ -60,13 +60,49 @@ Definition:
 ],
 ```
 
-### ArrayFlatten (array_flatten)
+#### Example:
 
-This flattens a nested array.
+Given the following data
 
-Arguments: N/A
+```php
+array(
+	array("industry" => "media" ),
+	array("industry" => "software" )
+);
+```
 
-Definition:
+Use `array_column` to extract `array("media", "software")` then choose the first element with `dot_notation`.
+
+```php
+"transformers": [
+    {
+        "use": "array_column",
+        "arguments": {
+            "key": "industry"
+        }
+    },
+    {
+    	"use": "dot_notation",
+    	"arguments": {
+    		"key": "0"
+    	}
+    }
+],
+```
+
+**Output**: "media"
+
+
+
+
+
+## array_flatten
+
+Flattens a nested array.
+
+#### Arguments: N/A
+
+#### Definition:
 
 ```php
 "transformers": [
@@ -76,13 +112,50 @@ Definition:
 ],
 ```
 
-### ArrayKeys (array_keys)
+#### Example:
 
-This uses PHP's built-in `array_keys` to return keys from an array.
+Given the following data
 
-Arguments: N/A
+```php
+array(
+	array(
+		'member1',
+	),
+	array(
+		'member2',
+	),
+	array(
+		'member3',
+	),
+);
+```
 
-Definition:
+Use `array_flatten` to extract `array("member1", "member2", "member3")` then use `array_search` to make sure it has `member2`
+
+
+```php
+"transformers": [
+    {
+        "use": "array_flatten",
+    },
+    {
+        "use": "array_search",
+        "arguments": {
+            "key": "member2"
+        }
+    }
+],
+```
+
+**Output**: true
+
+## array_keys
+
+PHP's built-in `array_keys` to return keys from an array. For more information about how `array_keys` works, please see PHP’s [official documentation](https://www.php.net/manual/en/function.array-column.php).
+
+#### Arguments: N/A
+
+####Definition:
 
 ```php
 "transformers": [
@@ -92,16 +165,47 @@ Definition:
 ],
 ```
 
-### ArraySearch (array_search)
+#### Example:
 
-This uses PHP's built-in `array_search` to search a value in an array.
+Given the following data
+
+```php
+array(
+    "name" => "tester",
+    "address" => "test",
+    "supports_version_2" => true
+)
+```
+
+Use `array_keys` to extract `array("name", "address", "supports_version_2")` and then use `array_search` to make sure it has `supports_version_2`
+
+```php
+"transformers": [
+    {
+        "use": "array_keys",
+    },
+    {
+        "use": "array_search",
+        "arguments": {
+            "key": "member2"
+        }
+    }
+],
+```
+
+**Output**: true
+
+## array_search
+
+PHP's built-in `array_search` to search a value in an array. For more information about how `array_search` works, please see PHP’s [official documentation](https://www.php.net/manual/en/function.array-search.php).
+
+#### Arguments:
 
-Arguments:
 |name|description|
 |----|---------|
 | value | a value to search in the given array |
 
-Definition:
+#### Definition:
 
 ```php
 "transformers": [
@@ -114,13 +218,18 @@ Definition:
 ],
 ```
 
-### ArrayValues (array_values)
+#### Examples
 
-This uses PHP's built-in array_values to return values from an array.
+See examples from [array_flatten](#array_flatten) and [array_keys](#array_keys)
 
-Arguments: N/A
+## array_values
 
-Definition:
+PHP's built-in array_values to return values from an array. For more information about how `array_values` works, please see PHP’s [official documentation](https://www.php.net/manual/en/function.array-values).
+
+
+#### Arguments: N/A
+
+#### Definition:
 
 ```php
 "transformers": [
@@ -130,20 +239,37 @@ Definition:
 ],
 ```
 
-### DotNotation (dot_notation)
+#### Example:
 
-This uses dot notation to select a value in an array. Dot notation lets you access an array as if it is an object.
-
-Let's say we have the following array.
+Given the following data
 
 ```php
-$items = [
-    'name' => 'name',
-    'members' => ['member1', 'member2']
-];
+array (
+	"size" => "x-large"
+)
 ```
 
-Example definition to select `$items['name']`:
+Use `array_values` to extract `array("x-large")`
+
+```php
+"transformers": [
+    {
+        "use": "array_values",
+    }
+],
+```
+
+**Output:** "x-large"
+
+
+## dot_notation
+
+Uses dot notation to select a value in an array. Dot notation lets you access an array as if it is an object.
+
+#### Arguments: N/A
+
+#### Definition:
+
 
 ```php
 "transformers": [
@@ -156,26 +282,56 @@ Example definition to select `$items['name']`:
 ],
 ```
 
-Example definition to select `$items['members'][0]`:
+#### Example:
+
+
+
+Given the following data
+
+```php
+array(
+    'name' => 'john',
+    'members' => ['member1', 'member2']
+);
+```
+
+Select `name` field.
 
 ```php
 "transformers": [
     {
         "use": "dot_notation",
         "arguments": {
-            "path": "members.0"
+            "path": "name"
         }
     }
 ],
 ```
 
-### Count (count)
+**Output:** "john"
 
-This uses PHP's built-in count to return the number of values from a countable, such as an array.
+Select `member2`. You can access array items with an index.
 
-Arguments: N/A
+```php
+"transformers": [
+    {
+        "use": "dot_notation",
+        "arguments": {
+            "path": "members.1"
+        }
+    }
+],
+```
 
-Definition:
+**Output:**: "member2"
+
+## count
+
+PHP's built-in count to return the number of values from a countable, such as an array.
+
+#### Arguments: N/A
+
+#### Definition:
 
 ```php
 "transformers": [
@@ -184,3 +340,29 @@ Definition:
     }
 ],
 ```
+
+#### Example:
+
+Given the following list of usernames
+
+```php
+array(
+	"username1",
+	"username2",
+	"username3"
+)
+```
+
+Let's count # of users with `count`
+
+```php
+"transformers": [
+    {
+        "use": "count",
+    }
+],
+```
+
+**Output:** 3
+
+
diff --git a/plugins/woocommerce/src/Checkout/Helpers/ReserveStock.php b/plugins/woocommerce/src/Checkout/Helpers/ReserveStock.php
index 247e80a5255..59cff93f637 100644
--- a/plugins/woocommerce/src/Checkout/Helpers/ReserveStock.php
+++ b/plugins/woocommerce/src/Checkout/Helpers/ReserveStock.php
@@ -72,6 +72,8 @@ final class ReserveStock {
 			return;
 		}
 
+		$held_stock_notes = array();
+
 		try {
 			$items = array_filter(
 				$order->get_items(),
@@ -113,6 +115,11 @@ final class ReserveStock {
 				$item_quantity = apply_filters( 'woocommerce_order_item_quantity', $item->get_quantity(), $order, $item );
 
 				$rows[ $managed_by_id ] = isset( $rows[ $managed_by_id ] ) ? $rows[ $managed_by_id ] + $item_quantity : $item_quantity;
+
+				if ( count( $held_stock_notes ) < 5 ) {
+					// translators: %1$s is a product's formatted name, %2$d: is the quantity of said product to which the stock hold applied.
+					$held_stock_notes[] = sprintf( _x( '- %1$s &times; %2$d', 'held stock note', 'woocommerce' ), $product->get_formatted_name(), $rows[ $managed_by_id ] );
+				}
 			}
 
 			if ( ! empty( $rows ) ) {
@@ -124,6 +131,27 @@ final class ReserveStock {
 			$this->release_stock_for_order( $order );
 			throw $e;
 		}
+
+		// Add order note after successfully holding the stock.
+		if ( ! empty( $held_stock_notes ) ) {
+			$remaining_count = count( $rows ) - count( $held_stock_notes );
+			if ( $remaining_count > 0 ) {
+				$held_stock_notes[] = sprintf(
+					// translators: %d is the remaining order items count.
+					_nx( '- ...and %d more item.', '- ... and %d more items.', $remaining_count, 'held stock note', 'woocommerce' ),
+					$remaining_count
+				);
+			}
+
+			$order->add_order_note(
+				sprintf(
+					// translators: %1$s is a time in minutes, %2$s is a list of products and quantities.
+					_x( 'Stock hold of %1$s minutes applied to: %2$s', 'held stock note', 'woocommerce' ),
+					$minutes,
+					'<br>' . implode( '<br>', $held_stock_notes )
+				)
+			);
+		}
 	}
 
 	/**
diff --git a/plugins/woocommerce/src/Database/Migrations/CustomOrderTable/CLIRunner.php b/plugins/woocommerce/src/Database/Migrations/CustomOrderTable/CLIRunner.php
index a25238b7c61..87bc72b7ef7 100644
--- a/plugins/woocommerce/src/Database/Migrations/CustomOrderTable/CLIRunner.php
+++ b/plugins/woocommerce/src/Database/Migrations/CustomOrderTable/CLIRunner.php
@@ -168,19 +168,21 @@ class CLIRunner {
 			return WP_CLI::warning( __( 'There are no orders to sync, aborting.', 'woocommerce' ) );
 		}
 
-		$assoc_args  = wp_parse_args(
+		$assoc_args       = wp_parse_args(
 			$assoc_args,
 			array(
 				'batch-size' => 500,
 			)
 		);
-		$batch_size  = ( (int) $assoc_args['batch-size'] ) === 0 ? 500 : (int) $assoc_args['batch-size'];
-		$progress    = WP_CLI\Utils\make_progress_bar( 'Order Data Sync', $order_count / $batch_size );
-		$processed   = 0;
-		$batch_count = 1;
-		$total_time  = 0;
+		$batch_size       = ( (int) $assoc_args['batch-size'] ) === 0 ? 500 : (int) $assoc_args['batch-size'];
+		$progress         = WP_CLI\Utils\make_progress_bar( 'Order Data Sync', $order_count / $batch_size );
+		$processed        = 0;
+		$batch_count      = 1;
+		$total_time       = 0;
+		$orders_remaining = true;
 
-		while ( $order_count > 0 ) {
+		while ( $order_count > 0 || $orders_remaining ) {
+			$remaining_count = $order_count;
 
 			WP_CLI::debug(
 				sprintf(
@@ -213,11 +215,8 @@ class CLIRunner {
 
 			$progress->tick();
 
-			$remaining_count = $this->count_unmigrated( array(), array( 'log' => false ) );
-			if ( $remaining_count === $order_count ) {
-				return WP_CLI::error( __( 'Infinite loop detected, aborting.', 'woocommerce' ) );
-			}
-			$order_count = $remaining_count;
+			$orders_remaining = count( $this->synchronizer->get_next_batch_to_process( 1 ) ) > 0;
+			$order_count      = $remaining_count - $batch_size;
 		}
 
 		$progress->finish();
@@ -300,6 +299,11 @@ class CLIRunner {
 	 * default: false
 	 * ---
 	 *
+	 * [--order-types]
+	 * : Comma seperated list of order types that needs to be verified. For example, --order-types=shop_order,shop_order_refund
+	 * ---
+	 * default: Output of function `wc_get_order_types( 'cot-migration' )`
+	 *
 	 * ## EXAMPLES
 	 *
 	 *     # Verify migrated order data, 500 orders at a time.
@@ -318,10 +322,11 @@ class CLIRunner {
 		$assoc_args = wp_parse_args(
 			$assoc_args,
 			array(
-				'batch-size' => 500,
-				'start-from' => 0,
-				'end-at'     => -1,
-				'verbose'    => false,
+				'batch-size'  => 500,
+				'start-from'  => 0,
+				'end-at'      => - 1,
+				'verbose'     => false,
+				'order-types' => '',
 			)
 		);
 
@@ -332,9 +337,27 @@ class CLIRunner {
 		$order_id_start = (int) $assoc_args['start-from'];
 		$order_id_end   = (int) $assoc_args['end-at'];
 		$order_id_end   = -1 === $order_id_end ? PHP_INT_MAX : $order_id_end;
-		$order_count    = $this->get_verify_order_count( $order_id_start, $order_id_end, false );
 		$batch_size     = ( (int) $assoc_args['batch-size'] ) === 0 ? 500 : (int) $assoc_args['batch-size'];
 		$verbose        = (bool) $assoc_args['verbose'];
+		$order_types    = wc_get_order_types( 'cot-migration' );
+		if ( ! empty( $assoc_args['order-types'] ) ) {
+			$passed_order_types = array_map( 'trim', explode( ',', $assoc_args['order-types'] ) );
+			$order_types        = array_intersect( $order_types, $passed_order_types );
+		}
+
+		if ( 0 === count( $order_types ) ) {
+			return WP_CLI::error(
+				sprintf(
+				/* Translators: %s is the comma seperated list of order types. */
+					__( 'Passed order type does not match any registered order types. Following order types are registered: %s', 'woocommerce' ),
+					implode( ',', wc_get_order_types( 'cot-migration' ) )
+				)
+			);
+		}
+
+		$order_types_pl = implode( ',', array_fill( 0, count( $order_types ), '%s' ) );
+
+		$order_count = $this->get_verify_order_count( $order_id_start, $order_id_end, $order_types, false );
 
 		$progress = WP_CLI\Utils\make_progress_bar( 'Order Data Verification', $order_count / $batch_size );
 
@@ -352,14 +375,21 @@ class CLIRunner {
 				)
 			);
 
-			$order_ids                   = $wpdb->get_col(
+			// phpcs:disable WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber, WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Inputs are prepared.
+			$order_ids = $wpdb->get_col(
 				$wpdb->prepare(
-					"SELECT ID FROM $wpdb->posts WHERE post_type = 'shop_order' AND ID >= %d AND ID <= %d ORDER BY ID ASC LIMIT %d",
-					$order_id_start,
-					$order_id_end,
-					$batch_size
+					"SELECT ID FROM $wpdb->posts WHERE post_type in ( $order_types_pl ) AND ID >= %d AND ID <= %d ORDER BY ID ASC LIMIT %d",
+					array_merge(
+						$order_types,
+						array(
+							$order_id_start,
+							$order_id_end,
+							$batch_size,
+						)
+					)
 				)
 			);
+			// phpcs:enable
 			$batch_start_time            = microtime( true );
 			$failed_ids_in_current_batch = $this->post_to_cot_migrator->verify_migrated_orders( $order_ids );
 			$failed_ids_in_current_batch = $this->verify_meta_data( $order_ids, $failed_ids_in_current_batch );
@@ -400,7 +430,7 @@ class CLIRunner {
 			);
 
 			$order_id_start  = max( $order_ids ) + 1;
-			$remaining_count = $this->get_verify_order_count( $order_id_start, $order_id_end, false );
+			$remaining_count = $this->get_verify_order_count( $order_id_start, $order_id_end, $order_types, false );
 			if ( $remaining_count === $order_count ) {
 				return WP_CLI::error( __( 'Infinite loop detected, aborting. No errors found.', 'woocommerce' ) );
 			}
@@ -429,6 +459,7 @@ class CLIRunner {
 				)
 			);
 		} else {
+			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r -- This is a CLI command and debugging code is intended.
 			$errors = print_r( $failed_ids, true );
 
 			return WP_CLI::error(
@@ -464,22 +495,32 @@ class CLIRunner {
 	/**
 	 * Helper method to get count for orders needing verification.
 	 *
-	 * @param int  $order_id_start Order ID to start from.
-	 * @param int  $order_id_end   Order ID to end at.
-	 * @param bool $log Whether to also log an error message.
+	 * @param int   $order_id_start Order ID to start from.
+	 * @param int   $order_id_end Order ID to end at.
+	 * @param array $order_types List of order types to verify.
+	 * @param bool  $log Whether to also log an error message.
 	 *
 	 * @return int Order count.
 	 */
-	private function get_verify_order_count( int $order_id_start, int $order_id_end, $log = true ) : int {
+	private function get_verify_order_count( int $order_id_start, int $order_id_end, array $order_types, bool $log = true ) : int {
 		global $wpdb;
 
+		$order_types_placeholder = implode( ',', array_fill( 0, count( $order_types ), '%s' ) );
+
+		// phpcs:disable WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber, WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Inputs are prepared.
 		$order_count = (int) $wpdb->get_var(
 			$wpdb->prepare(
-				"SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'shop_order' AND ID >= %d AND ID <= %d",
-				$order_id_start,
-				$order_id_end
+				"SELECT COUNT(*) FROM $wpdb->posts WHERE post_type in ($order_types_placeholder) AND ID >= %d AND ID <= %d",
+				array_merge(
+					$order_types,
+					array(
+						$order_id_start,
+						$order_id_end,
+					)
+				)
 			)
 		);
+		// phpcs:enable
 
 		if ( $log ) {
 			WP_CLI::log(
@@ -517,8 +558,8 @@ class CLIRunner {
 		$order_ids_placeholder        = implode( ', ', array_fill( 0, count( $order_ids ), '%d' ) );
 		$meta_table                   = OrdersTableDataStore::get_meta_table_name();
 
-		// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQL.NotPrepared -- table names are hardcoded, orders_ids and excluded_columns are prepared.
-		$query           = $wpdb->prepare(
+		// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQL.NotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare -- table names are hardcoded, orders_ids and excluded_columns are prepared.
+		$query       = $wpdb->prepare(
 			"
 SELECT {$wpdb->postmeta}.post_id as entity_id, {$wpdb->postmeta}.meta_key, {$wpdb->postmeta}.meta_value
 FROM $wpdb->postmeta
@@ -537,7 +578,7 @@ ORDER BY {$wpdb->postmeta}.post_id ASC, {$wpdb->postmeta}.meta_key ASC;
 
 		$normalized_source_data = $this->normalize_raw_meta_data( $source_data );
 
-		// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQL.NotPrepared -- table names are hardcoded, orders_ids and excluded_columns are prepared.
+		// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQL.NotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare -- table names are hardcoded, orders_ids and excluded_columns are prepared.
 		$migrated_query = $wpdb->prepare(
 			"
 SELECT $meta_table.order_id as entity_id, $meta_table.meta_key, $meta_table.meta_value
@@ -556,17 +597,17 @@ ORDER BY $meta_table.order_id ASC, $meta_table.meta_key ASC;
 		foreach ( $normalized_source_data as $order_id => $meta ) {
 			foreach ( $meta as $meta_key => $values ) {
 				$migrated_meta_values = isset( $normalized_migrated_meta_data[ $order_id ][ $meta_key ] ) ? $normalized_migrated_meta_data[ $order_id ][ $meta_key ] : array();
-				$diff = array_diff( $values, $migrated_meta_values );
+				$diff                 = array_diff( $values, $migrated_meta_values );
 
 				if ( count( $diff ) ) {
 					if ( ! isset( $failed_ids[ $order_id ] ) ) {
 						$failed_ids[ $order_id ] = array();
 					}
 					$failed_ids[ $order_id ][] = array(
-						'order_id'   => $order_id,
-						'meta_key'   => $meta_key,
+						'order_id'         => $order_id,
+						'meta_key'         => $meta_key, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key -- Not a meta query.
 						'orig_meta_values' => $values,
-						'new_meta_values' => $migrated_meta_values,
+						'new_meta_values'  => $migrated_meta_values,
 					);
 				}
 			}
@@ -589,7 +630,7 @@ ORDER BY $meta_table.order_id ASC, $meta_table.meta_key ASC;
 				$clubbed_data[ $row['entity_id'] ] = array();
 			}
 			if ( ! isset( $clubbed_data[ $row['entity_id'] ][ $row['meta_key'] ] ) ) {
-				$clubbed_data[ $row['entity_id'] ][ $row['meta_key'] ] = array();
+				$clubbed_data[ $row['entity_id'] ][ $row['meta_key'] ] = array(); // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key -- Not a meta query.
 			}
 			$clubbed_data[ $row['entity_id'] ][ $row['meta_key'] ][] = $row['meta_value'];
 		}
diff --git a/plugins/woocommerce/src/Database/Migrations/MetaToCustomTableMigrator.php b/plugins/woocommerce/src/Database/Migrations/MetaToCustomTableMigrator.php
index 55c3e9d1973..6a8739d508a 100644
--- a/plugins/woocommerce/src/Database/Migrations/MetaToCustomTableMigrator.php
+++ b/plugins/woocommerce/src/Database/Migrations/MetaToCustomTableMigrator.php
@@ -193,16 +193,20 @@ abstract class MetaToCustomTableMigrator extends TableMigrator {
 			$columns[]      = $schema['destination'];
 			$placeholders[] = MigrationHelper::get_wpdb_placeholder_for_type( $schema['type'] );
 		}
-		$placeholders = "'" . implode( "', '", $placeholders ) . "'";
 
 		$values = array();
 		foreach ( array_values( $batch ) as $row ) {
-			$query_params = array();
-			foreach ( $columns as $column ) {
-				$query_params[] = $row[ $column ] ?? null;
+			$row_values = array();
+			foreach ( $columns as $index => $column ) {
+				if ( ! isset( $row[ $column ] ) || is_null( $row[ $column ] ) ) {
+					$row_values[] = 'NULL';
+				} else {
+					// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, WordPress.DB.PreparedSQL.NotPrepared -- $placeholders is a placeholder.
+					$row_values[] = $wpdb->prepare( $placeholders[ $index ], $row[ $column ] );
+				}
 			}
-			// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- $placeholders can only contain combination of placeholders described in MigrationHelper::get_wpdb_placeholder_for_type
-			$value_string = '(' . $wpdb->prepare( $placeholders, $query_params ) . ')';
+
+			$value_string = '(' . implode( ',', $row_values ) . ')';
 			$values[]     = $value_string;
 		}
 
@@ -832,7 +836,10 @@ WHERE $where_clause
 		if ( ! isset( $row[ $alias ] ) ) {
 			$row[ $alias ] = $this->get_type_defaults( $schema['type'] );
 		}
-		if ( in_array( $schema['type'], array( 'int', 'decimal' ), true ) ) {
+		if ( is_null( $row[ $destination_alias ] ) ) {
+			$row[ $destination_alias ] = $this->get_type_defaults( $schema['type'] );
+		}
+		if ( in_array( $schema['type'], array( 'int', 'decimal', 'float' ), true ) ) {
 			if ( '' === $row[ $alias ] || null === $row[ $alias ] ) {
 				$row[ $alias ] = 0; // $wpdb->prepare forces empty values to 0.
 			}
@@ -867,6 +874,7 @@ WHERE $where_clause
 		switch ( $type ) {
 			case 'float':
 			case 'int':
+			case 'decimal':
 				return 0;
 			case 'string':
 				return '';
diff --git a/plugins/woocommerce/src/Internal/Admin/Loader.php b/plugins/woocommerce/src/Internal/Admin/Loader.php
index 27758986e18..e190836b0cb 100644
--- a/plugins/woocommerce/src/Internal/Admin/Loader.php
+++ b/plugins/woocommerce/src/Internal/Admin/Loader.php
@@ -302,7 +302,7 @@ class Loader {
 	}
 
 	/**
-	 * Hooks extra neccessary data into the component settings array already set in WooCommerce core.
+	 * Hooks extra necessary data into the component settings array already set in WooCommerce core.
 	 *
 	 * @param array $settings Array of component settings.
 	 * @return array Array of component settings.
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php
index 578918c954c..ffa5dcde7ab 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php
@@ -128,9 +128,6 @@ class OnboardingProducts {
 				$product_data[ $key ]['description']  = $products[ $product_type['product'] ]->excerpt;
 				$product_data[ $key ]['more_url']     = $products[ $product_type['product'] ]->link;
 				$product_data[ $key ]['slug']         = strtolower( preg_replace( '~[^\pL\d]+~u', '-', $products[ $product_type['product'] ]->slug ) );
-			} elseif ( isset( $product_type['product'] ) ) {
-				/* translators: site currency symbol (used to show that the product costs money) */
-				$product_data[ $key ]['label'] .= sprintf( __( ' — %s', 'woocommerce' ), html_entity_decode( get_woocommerce_currency_symbol() ) );
 			}
 		}
 
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php
index 2c058c54a0e..087a1e2e9d9 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php
@@ -22,7 +22,6 @@ class OnboardingProfile {
 	 * Add onboarding actions.
 	 */
 	public static function init() {
-		add_action( 'woocommerce_updated', array( __CLASS__, 'maybe_mark_complete' ) );
 		add_action( 'update_option_' . self::DATA_OPTION, array( __CLASS__, 'trigger_complete' ), 10, 2 );
 	}
 
@@ -65,37 +64,4 @@ class OnboardingProfile {
 		// https://github.com/woocommerce/woocommerce-admin/pull/2300#discussion_r287237498.
 		return ! $is_completed && ! $is_skipped;
 	}
-
-	/**
-	 * When updating WooCommerce, mark the profiler and task list complete.
-	 *
-	 * @todo The `maybe_enable_setup_wizard()` method should be revamped on onboarding enable in core.
-	 * See https://github.com/woocommerce/woocommerce/blob/1ca791f8f2325fe2ee0947b9c47e6a4627366374/includes/class-wc-install.php#L341
-	 */
-	public static function maybe_mark_complete() {
-		// The install notice still exists so don't complete the profiler.
-		if ( ! class_exists( 'WC_Admin_Notices' ) || \WC_Admin_Notices::has_notice( 'install' ) ) {
-			return;
-		}
-
-		$onboarding_data = get_option( self::DATA_OPTION, array() );
-		// Don't make updates if the profiler is completed or skipped, but task list is potentially incomplete.
-		if (
-			( isset( $onboarding_data['completed'] ) && $onboarding_data['completed'] ) ||
-			( isset( $onboarding_data['skipped'] ) && $onboarding_data['skipped'] )
-		) {
-			return;
-		}
-
-		$onboarding_data['completed'] = true;
-		update_option( self::DATA_OPTION, $onboarding_data );
-
-		if ( ! WCAdminHelper::is_wc_admin_active_for( DAY_IN_SECONDS ) ) {
-			$task_list = TaskLists::get_list( 'setup' );
-			if ( ! $task_list ) {
-				return;
-			}
-			$task_list->hide();
-		}
-	}
 }
diff --git a/plugins/woocommerce/src/Internal/Admin/Orders/EditLock.php b/plugins/woocommerce/src/Internal/Admin/Orders/EditLock.php
new file mode 100644
index 00000000000..0219ae97c1a
--- /dev/null
+++ b/plugins/woocommerce/src/Internal/Admin/Orders/EditLock.php
@@ -0,0 +1,211 @@
+<?php
+namespace Automattic\WooCommerce\Internal\Admin\Orders;
+
+/**
+ * This class takes care of the edit lock logic when HPOS is enabled.
+ * For better interoperability with WordPress, edit locks are stored in the same format as posts. That is, as a metadata
+ * in the order object (key: '_edit_lock') in the format "timestamp:user_id".
+ *
+ * @since 7.8.0
+ */
+class EditLock {
+
+	const META_KEY_NAME = '_edit_lock';
+
+	/**
+	 * Obtains lock information for a given order. If the lock has expired or it's assigned to an invalid user,
+	 * the order is no longer considered locked.
+	 *
+	 * @param \WC_Order $order Order to check.
+	 * @return bool|array
+	 */
+	public function get_lock( \WC_Order $order ) {
+		$lock = $order->get_meta( self::META_KEY_NAME, true, 'edit' );
+		if ( ! $lock ) {
+			return false;
+		}
+
+		$lock = explode( ':', $lock );
+		if ( 2 !== count( $lock ) ) {
+			return false;
+		}
+
+		$time    = absint( $lock[0] );
+		$user_id = isset( $lock[1] ) ? absint( $lock[1] ) : 0;
+
+		if ( ! $time || ! get_user_by( 'id', $user_id ) ) {
+			return false;
+		}
+
+		/** This filter is documented in WP's wp-admin/includes/ajax-actions.php */
+		$time_window = apply_filters( 'wp_check_post_lock_window', 150 ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingSinceComment
+		if ( time() >= ( $time + $time_window ) ) {
+			return false;
+		}
+
+		return compact( 'time', 'user_id' );
+	}
+
+	/**
+	 * Checks whether the order is being edited (i.e. locked) by another user.
+	 *
+	 * @param \WC_Order $order Order to check.
+	 * @return bool TRUE if order is locked and currently being edited by another user. FALSE otherwise.
+	 */
+	public function is_locked_by_another_user( \WC_Order $order ) : bool {
+		$lock = $this->get_lock( $order );
+		return $lock && ( get_current_user_id() !== $lock['user_id'] );
+	}
+
+	/**
+	 * Checks whether the order is being edited by any user.
+	 *
+	 * @param \WC_Order $order Order to check.
+	 * @return boolean TRUE if order is locked and currently being edited by a user. FALSE otherwise.
+	 */
+	public function is_locked( \WC_Order $order ) : bool {
+		return (bool) $this->get_lock( $order );
+	}
+
+	/**
+	 * Assigns an order's edit lock to the current user.
+	 *
+	 * @param \WC_Order $order The order to apply the lock to.
+	 * @return array|bool FALSE if no user is logged-in, an array in the same format as {@see get_lock()} otherwise.
+	 */
+	public function lock( \WC_Order $order ) {
+		$user_id = get_current_user_id();
+
+		if ( ! $user_id ) {
+			return false;
+		}
+
+		$order->update_meta_data( self::META_KEY_NAME, time() . ':' . $user_id );
+		$order->save_meta_data();
+
+		return $order->get_meta( self::META_KEY_NAME, true, 'edit' );
+	}
+
+	/**
+	 * Hooked to 'heartbeat_received' on the edit order page to refresh the lock on an order being edited by the current user.
+	 *
+	 * @param array $response The heartbeat response to be sent.
+	 * @param array $data     Data sent through the heartbeat.
+	 * @return array Response to be sent.
+	 */
+	public function refresh_lock_ajax( $response, $data ) {
+		$order_id = absint( $data['wc-refresh-order-lock'] ?? 0 );
+		if ( ! $order_id ) {
+			return $response;
+		}
+
+		$order = wc_get_order( $order_id );
+		if ( ! current_user_can( get_post_type_object( $order->get_type() )->cap->edit_post, $order->get_id() ) && ! current_user_can( 'manage_woocommerce' ) ) {
+			return $response;
+		}
+
+		$response['wc-refresh-order-lock'] = array();
+
+		if ( ! $this->is_locked_by_another_user( $order ) ) {
+			$response['wc-refresh-order-lock']['lock'] = $this->lock( $order );
+		} else {
+			$current_lock = $this->get_lock( $order );
+			$user         = get_user_by( 'id', $current_lock['user_id'] );
+
+			$response['wc-refresh-order-lock']['error'] = array(
+				// translators: %s is a user's name.
+				'message'            => sprintf( __( '%s has taken over and is currently editing.', 'woocommerce' ), $user->display_name ),
+				'user_name'          => $user->display_name,
+				'user_avatar_src'    => get_option( 'show_avatars' ) ? get_avatar_url( $user->ID, array( 'size' => 64 ) ) : '',
+				'user_avatar_src_2x' => get_option( 'show_avatars' ) ? get_avatar_url( $user->ID, array( 'size' => 128 ) ) : '',
+			);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Hooked to 'heartbeat_received' on the orders screen to refresh the locked status of orders in the list table.
+	 *
+	 * @param array $response The heartbeat response to be sent.
+	 * @param array $data     Data sent through the heartbeat.
+	 * @return array Response to be sent.
+	 */
+	public function check_locked_orders_ajax( $response, $data ) {
+		if ( empty( $data['wc-check-locked-orders'] ) || ! is_array( $data['wc-check-locked-orders'] ) ) {
+			return $response;
+		}
+
+		$response['wc-check-locked-orders'] = array();
+
+		$order_ids = array_unique( array_map( 'absint', $data['wc-check-locked-orders'] ) );
+		foreach ( $order_ids as $order_id ) {
+			$order = wc_get_order( $order_id );
+			if ( ! $order ) {
+				continue;
+			}
+
+			if ( ! $this->is_locked_by_another_user( $order ) || ( ! current_user_can( get_post_type_object( $order->get_type() )->cap->edit_post, $order->get_id() ) && ! current_user_can( 'manage_woocommerce' ) ) ) {
+				continue;
+			}
+
+			$response['wc-check-locked-orders'][ $order_id ] = true;
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Outputs HTML for the lock dialog based on the status of the lock on the order (if any).
+	 * Depending on who owns the lock, this could be a message with the chance to take over or a message indicating that
+	 * someone else has taken over the order.
+	 *
+	 * @param \WC_Order $order Order object.
+	 * @return void
+	 */
+	public function render_dialog( $order ) {
+		$locked = $this->is_locked_by_another_user( $order );
+		$lock   = $this->get_lock( $order );
+		$user   = get_user_by( 'id', $lock['user_id'] );
+
+		$edit_url = wc_get_container()->get( \Automattic\WooCommerce\Internal\Admin\Orders\PageController::class )->get_edit_url( $order->get_id() );
+
+		$sendback_url = wp_get_referer();
+		if ( ! $sendback_url ) {
+			$sendback_url = wc_get_container()->get( \Automattic\WooCommerce\Internal\Admin\Orders\PageController::class )->get_base_page_url( $order->get_type() );
+		}
+
+		$sendback_text = __( 'Go back', 'woocommerce' );
+		?>
+		<div id="post-lock-dialog" class="notification-dialog-wrap <?php echo $locked ? '' : 'hidden'; ?> order-lock-dialog">
+			<div class="notification-dialog-background"></div>
+			<div class="notification-dialog">
+			<?php if ( $locked ) : ?>
+			<div class="post-locked-message">
+				<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
+				<p class="currently-editing wp-tab-first" tabindex="0">
+				<?php
+				// translators: %s is a user's name.
+				echo esc_html( sprintf( __( '%s is currently editing this order. Do you want to take over?', 'woocommerce' ), esc_html( $user->display_name ) ) );
+				?>
+				</p>
+				<p>
+					<a class="button" href="<?php echo esc_url( $sendback_url ); ?>"><?php echo esc_html( $sendback_text ); ?></a>
+					<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'claim-lock', '1', wp_nonce_url( $edit_url, 'claim-lock-' . $order->get_id() ) ) ); ?>"><?php esc_html_e( 'Take over', 'woocommerce' ); ?></a>
+				</p>
+			</div>
+			<?php else : ?>
+			<div class="post-taken-over">
+				<div class="post-locked-avatar"></div>
+				<p class="wp-tab-first" tabindex="0">
+				<span class="currently-editing"></span><br />
+				</p>
+				<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback_url ); ?>"><?php echo esc_html( $sendback_text ); ?></a></p>
+			</div>
+			<?php endif; ?>
+			</div>
+		</div>
+		<?php
+	}
+
+}
diff --git a/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php b/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php
index c105b4e4ce1..9864904e074 100644
--- a/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php
+++ b/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php
@@ -4,6 +4,7 @@ namespace Automattic\WooCommerce\Internal\Admin\Orders;
 
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableDataStore;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 use WC_Order;
 use WP_List_Table;
 use WP_Screen;
@@ -109,6 +110,44 @@ class ListTable extends WP_List_Table {
 		add_action( 'manage_' . wc_get_page_screen_id( $this->order_type ) . '_custom_column', array( $this, 'render_column' ), 10, 2 );
 	}
 
+	/**
+	 * Generates content for a single row of the table.
+	 *
+	 * @since 7.8.0
+	 *
+	 * @param \WC_Order $order The current order.
+	 */
+	public function single_row( $order ) {
+		/**
+		 * Filters the list of CSS class names for a given order row in the orders list table.
+		 *
+		 * @since 7.8.0
+		 *
+		 * @param string[]  $classes An array of CSS class names.
+		 * @param \WC_Order $order   The order object.
+		 */
+		$css_classes = apply_filters(
+			'woocommerce_' . $this->order_type . '_list_table_order_css_classes',
+			array(
+				'order-' . $order->get_id(),
+				'type-' . $order->get_type(),
+				'status-' . $order->get_status(),
+			),
+			$order
+		);
+		$css_classes = array_unique( array_map( 'trim', $css_classes ) );
+
+		// Is locked?
+		$edit_lock = wc_get_container()->get( EditLock::class );
+		if ( $edit_lock->is_locked_by_another_user( $order ) ) {
+			$css_classes[] = 'wp-locked';
+		}
+
+		echo '<tr id="order-' . esc_attr( $order->get_id() ) . '" class="' . esc_attr( implode( ' ', $css_classes ) ) . '">';
+		$this->single_row_columns( $order );
+		echo '</tr>';
+	}
+
 	/**
 	 * Render individual column.
 	 *
@@ -276,6 +315,37 @@ class ListTable extends WP_List_Table {
 		return $actions;
 	}
 
+	/**
+	 * Gets a list of CSS classes for the WP_List_Table table tag.
+	 *
+	 * @since 7.8.0
+	 *
+	 * @return string[] Array of CSS classes for the table tag.
+	 */
+	protected function get_table_classes() {
+		/**
+		 * Filters the list of CSS class names for the orders list table.
+		 *
+		 * @since 7.8.0
+		 *
+		 * @param string[] $classes    An array of CSS class names.
+		 * @param string   $order_type The order type.
+		 */
+		$css_classes = apply_filters(
+			'woocommerce_' . $this->order_type . '_list_table_css_classes',
+			array_merge(
+				parent::get_table_classes(),
+				array(
+					'wc-orders-list-table',
+					'wc-orders-list-table-' . $this->order_type,
+				)
+			),
+			$this->order_type
+		);
+
+		return array_unique( array_map( 'trim', $css_classes ) );
+	}
+
 	/**
 	 * Prepares the list of items for displaying.
 	 */
@@ -795,7 +865,21 @@ class ListTable extends WP_List_Table {
 	 * @return string
 	 */
 	public function column_cb( $item ) {
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', esc_attr( $this->_args['singular'] ), esc_attr( $item->get_id() ) );
+		ob_start();
+		?>
+		<input id="cb-select-<?php echo esc_attr( $item->get_id() ); ?>" type="checkbox" name="<?php echo esc_attr( $this->_args['singular'] ); ?>" value="<?php echo esc_attr( $item->get_id() ); ?>" />
+
+		<div class="locked-indicator">
+			<span class="locked-indicator-icon" aria-hidden="true"></span>
+			<span class="screen-reader-text">
+				<?php
+				// translators: %s is an order ID.
+				echo esc_html( sprintf( __( 'Order %s is locked.', 'woocommerce' ), $item->get_id() ) );
+				?>
+			</span>
+		</div>
+		<?php
+		return ob_get_clean();
 	}
 
 	/**
@@ -1113,7 +1197,7 @@ class ListTable extends WP_List_Table {
 
 			$action = 'delete';
 		} else {
-			$ids = isset( $_REQUEST['order'] ) ? array_reverse( array_map( 'absint', $_REQUEST['order'] ) ) : array();
+			$ids = isset( $_REQUEST['order'] ) ? array_reverse( array_map( 'absint', (array) $_REQUEST['order'] ) ) : array();
 		}
 
 		/**
diff --git a/plugins/woocommerce/src/Internal/Admin/Orders/PageController.php b/plugins/woocommerce/src/Internal/Admin/Orders/PageController.php
index 7f6109a2dbd..b710a4e2456 100644
--- a/plugins/woocommerce/src/Internal/Admin/Orders/PageController.php
+++ b/plugins/woocommerce/src/Internal/Admin/Orders/PageController.php
@@ -91,6 +91,40 @@ class PageController {
 		}
 	}
 
+	/**
+	 * Claims the lock for the order being edited/created (unless it belongs to someone else).
+	 * Also handles the 'claim-lock' action which allows taking over the order forcefully.
+	 *
+	 * @return void
+	 */
+	private function handle_edit_lock() {
+		if ( ! $this->order ) {
+			return;
+		}
+
+		$edit_lock = wc_get_container()->get( EditLock::class );
+
+		$locked = $edit_lock->is_locked_by_another_user( $this->order );
+
+		// Take over order?
+		if ( ! empty( $_GET['claim-lock'] ) && wp_verify_nonce( $_GET['_wpnonce'] ?? '', 'claim-lock-' . $this->order->get_id() ) ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized,WordPress.Security.ValidatedSanitizedInput.MissingUnslash
+			$edit_lock->lock( $this->order );
+			wp_safe_redirect( $this->get_edit_url( $this->order->get_id() ) );
+			exit;
+		}
+
+		if ( ! $locked ) {
+			$edit_lock->lock( $this->order );
+		}
+
+		add_action(
+			'admin_footer',
+			function() use ( $edit_lock ) {
+				$edit_lock->render_dialog( $this->order );
+			}
+		);
+	}
+
 	/**
 	 * Sets up the page controller, including registering the menu item.
 	 *
@@ -266,6 +300,7 @@ class PageController {
 		global $theorder;
 		$this->order = wc_get_order( absint( isset( $_GET['id'] ) ? $_GET['id'] : 0 ) );
 		$this->verify_edit_permission();
+		$this->handle_edit_lock();
 		$theorder = $this->order;
 	}
 
@@ -288,6 +323,7 @@ class PageController {
 		$this->order->set_object_read( false );
 		$this->order->set_status( 'auto-draft' );
 		$this->order->save();
+		$this->handle_edit_lock();
 
 		// Schedule auto-draft cleanup. We re-use the WP event here on purpose.
 		if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
diff --git a/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php b/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php
index e893afd283e..d49c3547731 100644
--- a/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php
+++ b/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/DefaultFreeExtensions.php
@@ -21,50 +21,66 @@ class DefaultFreeExtensions {
 	 * @return array Default specs.
 	 */
 	public static function get_all() {
-		$bundles = [
-			[
+		$bundles = array(
+			array(
 				'key'     => 'obw/basics',
 				'title'   => __( 'Get the basics', 'woocommerce' ),
-				'plugins' => [
+				'plugins' => array(
 					self::get_plugin( 'woocommerce-payments' ),
 					self::get_plugin( 'woocommerce-services:shipping' ),
 					self::get_plugin( 'woocommerce-services:tax' ),
 					self::get_plugin( 'jetpack' ),
-				],
-			],
-			[
+				),
+			),
+			array(
 				'key'     => 'obw/grow',
 				'title'   => __( 'Grow your store', 'woocommerce' ),
-				'plugins' => [
+				'plugins' => array(
 					self::get_plugin( 'mailpoet' ),
 					self::get_plugin( 'codistoconnect' ),
 					self::get_plugin( 'google-listings-and-ads' ),
 					self::get_plugin( 'pinterest-for-woocommerce' ),
 					self::get_plugin( 'facebook-for-woocommerce' ),
 					self::get_plugin( 'tiktok-for-business:alt' ),
-				],
-			],
-			[
+				),
+			),
+			array(
 				'key'     => 'task-list/reach',
 				'title'   => __( 'Reach out to customers', 'woocommerce' ),
-				'plugins' => [
+				'plugins' => array(
 					self::get_plugin( 'mailpoet:alt' ),
 					self::get_plugin( 'mailchimp-for-woocommerce' ),
 					self::get_plugin( 'creative-mail-by-constant-contact' ),
-				],
-			],
-			[
+				),
+			),
+			array(
 				'key'     => 'task-list/grow',
 				'title'   => __( 'Grow your store', 'woocommerce' ),
-				'plugins' => [
+				'plugins' => array(
 					self::get_plugin( 'google-listings-and-ads:alt' ),
 					self::get_plugin( 'tiktok-for-business' ),
 					self::get_plugin( 'pinterest-for-woocommerce:alt' ),
 					self::get_plugin( 'facebook-for-woocommerce:alt' ),
 					self::get_plugin( 'codistoconnect:alt' ),
-				],
-			],
-		];
+				),
+			),
+			array(
+				'key'     => 'obw/core-profiler',
+				'title'   => __( 'Grow your store', 'woocommerce' ),
+				'plugins' => self::with_core_profiler_fields(
+					array(
+						self::get_plugin( 'woocommerce-payments' ),
+						self::get_plugin( 'woocommerce-services:shipping' ),
+						self::get_plugin( 'jetpack' ),
+						self::get_plugin( 'pinterest-for-woocommerce' ),
+						self::get_plugin( 'mailpoet' ),
+						self::get_plugin( 'tiktok-for-business' ),
+						self::get_plugin( 'google-listings-and-ads' ),
+						self::get_plugin( 'woocommerce-services:tax' ),
+					)
+				),
+			),
+		);
 
 		$bundles = wp_json_encode( $bundles );
 		return json_decode( $bundles );
@@ -78,7 +94,7 @@ class DefaultFreeExtensions {
 	 */
 	public static function get_plugin( $slug ) {
 		$plugins = array(
-			'google-listings-and-ads'           => [
+			'google-listings-and-ads'           => array(
 				'min_php_version' => '7.4',
 				'name'            => __( 'Google Listings & Ads', 'woocommerce' ),
 				'description'     => sprintf(
@@ -90,78 +106,78 @@ class DefaultFreeExtensions {
 				'image_url'       => plugins_url( '/assets/images/onboarding/google.svg', WC_PLUGIN_FILE ),
 				'manage_url'      => 'admin.php?page=wc-admin&path=%2Fgoogle%2Fstart',
 				'is_built_by_wc'  => true,
-				'is_visible'      => [
-					[
+				'is_visible'      => array(
+					array(
 						'type'    => 'not',
-						'operand' => [
-							[
+						'operand' => array(
+							array(
 								'type'    => 'plugins_activated',
-								'plugins' => [ 'google-listings-and-ads' ],
-							],
-						],
-					],
-				],
-			],
-			'google-listings-and-ads:alt'       => [
+								'plugins' => array( 'google-listings-and-ads' ),
+							),
+						),
+					),
+				),
+			),
+			'google-listings-and-ads:alt'       => array(
 				'name'           => __( 'Google Listings & Ads', 'woocommerce' ),
 				'description'    => __( 'Reach more shoppers and drive sales for your store. Integrate with Google to list your products for free and launch paid ad campaigns.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/google.svg', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=wc-admin&path=%2Fgoogle%2Fstart',
 				'is_built_by_wc' => true,
-			],
-			'facebook-for-woocommerce'          => [
+			),
+			'facebook-for-woocommerce'          => array(
 				'name'           => __( 'Facebook for WooCommerce', 'woocommerce' ),
 				'description'    => __( 'List products and create ads on Facebook and Instagram with <a href="https://woocommerce.com/products/facebook/">Facebook for WooCommerce</a>', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/facebook.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=wc-facebook',
 				'is_visible'     => false,
 				'is_built_by_wc' => false,
-			],
-			'facebook-for-woocommerce:alt'      => [
+			),
+			'facebook-for-woocommerce:alt'      => array(
 				'name'           => __( 'Facebook for WooCommerce', 'woocommerce' ),
 				'description'    => __( 'List products and create ads on Facebook and Instagram.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/facebook.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=wc-facebook',
 				'is_visible'     => false,
 				'is_built_by_wc' => false,
-			],
-			'pinterest-for-woocommerce'         => [
+			),
+			'pinterest-for-woocommerce'         => array(
 				'name'            => __( 'Pinterest for WooCommerce', 'woocommerce' ),
 				'description'     => __( 'Get your products in front of Pinners searching for ideas and things to buy.', 'woocommerce' ),
 				'image_url'       => plugins_url( '/assets/images/onboarding/pinterest.png', WC_PLUGIN_FILE ),
 				'manage_url'      => 'admin.php?page=wc-admin&path=%2Fpinterest%2Flanding',
 				'is_built_by_wc'  => true,
 				'min_php_version' => '7.3',
-			],
-			'pinterest-for-woocommerce:alt'     => [
+			),
+			'pinterest-for-woocommerce:alt'     => array(
 				'name'           => __( 'Pinterest for WooCommerce', 'woocommerce' ),
 				'description'    => __( 'Get your products in front of Pinterest users searching for ideas and things to buy. Get started with Pinterest and make your entire product catalog browsable.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/pinterest.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=wc-admin&path=%2Fpinterest%2Flanding',
 				'is_built_by_wc' => true,
-			],
-			'mailpoet'                          => [
+			),
+			'mailpoet'                          => array(
 				'name'           => __( 'MailPoet', 'woocommerce' ),
 				'description'    => __( 'Create and send purchase follow-up emails, newsletters, and promotional campaigns straight from your dashboard.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/mailpoet.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=mailpoet-newsletters',
 				'is_built_by_wc' => true,
-			],
-			'mailchimp-for-woocommerce'         => [
+			),
+			'mailchimp-for-woocommerce'         => array(
 				'name'           => __( 'Mailchimp', 'woocommerce' ),
 				'description'    => __( 'Send targeted campaigns, recover abandoned carts and much more with Mailchimp.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/mailchimp-for-woocommerce.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=mailchimp-woocommerce',
 				'is_built_by_wc' => false,
-			],
-			'creative-mail-by-constant-contact' => [
+			),
+			'creative-mail-by-constant-contact' => array(
 				'name'           => __( 'Creative Mail for WooCommerce', 'woocommerce' ),
 				'description'    => __( 'Create on-brand store campaigns, fast email promotions and customer retargeting with Creative Mail.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/creative-mail-by-constant-contact.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=creativemail',
 				'is_built_by_wc' => false,
-			],
-			'codistoconnect'                    => [
+			),
+			'codistoconnect'                    => array(
 				'name'           => __( 'Codisto for WooCommerce', 'woocommerce' ),
 				'description'    => sprintf(
 					/* translators: 1: opening product link tag. 2: closing link tag */
@@ -172,357 +188,366 @@ class DefaultFreeExtensions {
 				'image_url'      => plugins_url( '/assets/images/onboarding/codistoconnect.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=codisto-settings',
 				'is_built_by_wc' => true,
-			],
-			'codistoconnect:alt'                => [
+			),
+			'codistoconnect:alt'                => array(
 				'name'           => __( 'Codisto for WooCommerce', 'woocommerce' ),
 				'description'    => __( 'Sell on Amazon, eBay, Walmart and more directly from WooCommerce.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/codistoconnect.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=codisto-settings',
 				'is_built_by_wc' => true,
-			],
-			'woocommerce-payments'              => [
+			),
+			'woocommerce-payments'              => array(
+				'name'           => __( 'WooCommerce Payments', 'woocommerce' ),
+				'image_url'      => plugins_url( '/assets/images/onboarding/wcpay.svg', WC_PLUGIN_FILE ),
 				'description'    => sprintf(
 					/* translators: 1: opening product link tag. 2: closing link tag */
 					__( 'Accept credit cards and other popular payment methods with %1$sWooCommerce Payments%2$s', 'woocommerce' ),
 					'<a href="https://woocommerce.com/products/woocommerce-payments" target="_blank">',
 					'</a>'
 				),
-				'is_visible'     => [
-					[
+				'is_visible'     => array(
+					array(
 						'type'     => 'or',
-						'operands' => [
-							[
+						'operands' => array(
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'US',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'PR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'AU',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'CA',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'DE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'ES',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'FR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'GB',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'IE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'IT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'NZ',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'AT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'BE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'NL',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'PL',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'PT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'CH',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'HK',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'SG',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'CY',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'DK',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'EE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'FI',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'GR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'LU',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'LT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'LV',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'NO',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'MT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'SI',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'SK',
 								'operation' => '=',
-							],
-						],
-					],
+							),
+						),
+					),
 					DefaultPaymentGateways::get_rules_for_cbd( false ),
-				],
+				),
 				'is_built_by_wc' => true,
 				'min_wp_version' => '5.9',
-			],
-			'woocommerce-services:shipping'     => [
+			),
+			'woocommerce-services:shipping'     => array(
+				'name'           => __( 'WooCommerce Shipping', 'woocommerce' ),
+				'image_url'      => plugins_url( '/assets/images/onboarding/woo.svg', WC_PLUGIN_FILE ),
 				'description'    => sprintf(
 				/* translators: 1: opening product link tag. 2: closing link tag */
 					__( 'Print shipping labels with %1$sWooCommerce Shipping%2$s', 'woocommerce' ),
 					'<a href="https://woocommerce.com/products/shipping" target="_blank">',
 					'</a>'
 				),
-				'is_visible'     => [
-					[
+				'is_visible'     => array(
+					array(
 						'type'      => 'base_location_country',
 						'value'     => 'US',
 						'operation' => '=',
-					],
-					[
+					),
+					array(
 						'type'    => 'not',
-						'operand' => [
-							[
+						'operand' => array(
+							array(
 								'type'    => 'plugins_activated',
-								'plugins' => [ 'woocommerce-services' ],
-							],
-						],
-					],
-					[
+								'plugins' => array( 'woocommerce-services' ),
+							),
+						),
+					),
+					array(
 						'type'     => 'or',
-						'operands' => [
-							[
-								[
+						'operands' => array(
+							array(
+								array(
 									'type'         => 'option',
-									'transformers' => [
-										[
+									'transformers' => array(
+										array(
 											'use'       => 'dot_notation',
-											'arguments' => [
+											'arguments' => array(
 												'path' => 'product_types',
-											],
-										],
-										[
+											),
+										),
+										array(
 											'use' => 'count',
-										],
-									],
+										),
+									),
 									'option_name'  => 'woocommerce_onboarding_profile',
 									'value'        => 1,
 									'default'      => array(),
 									'operation'    => '!=',
-								],
-							],
-							[
-								[
+								),
+							),
+							array(
+								array(
 									'type'         => 'option',
-									'transformers' => [
-										[
+									'transformers' => array(
+										array(
 											'use'       => 'dot_notation',
-											'arguments' => [
+											'arguments' => array(
 												'path' => 'product_types.0',
-											],
-										],
-									],
+											),
+										),
+									),
 									'option_name'  => 'woocommerce_onboarding_profile',
 									'value'        => 'downloads',
 									'default'      => '',
 									'operation'    => '!=',
-								],
-							],
-						],
-					],
-				],
+								),
+							),
+						),
+					),
+				),
 				'is_built_by_wc' => true,
-			],
-			'woocommerce-services:tax'          => [
+			),
+			'woocommerce-services:tax'          => array(
+				'name'           => __( 'WooCommerce Tax', 'woocommerce' ),
+				'image_url'      => plugins_url( '/assets/images/onboarding/woo.svg', WC_PLUGIN_FILE ),
 				'description'    => sprintf(
 					/* translators: 1: opening product link tag. 2: closing link tag */
 					__( 'Get automated sales tax with %1$sWooCommerce Tax%2$s', 'woocommerce' ),
 					'<a href="https://woocommerce.com/products/tax" target="_blank">',
 					'</a>'
 				),
-				'is_visible'     => [
-					[
+				'is_visible'     => array(
+					array(
 						'type'     => 'or',
-						'operands' => [
-							[
+						'operands' => array(
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'US',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'FR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'GB',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'DE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'CA',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'AU',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'GR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'BE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'PT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'DK',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'SE',
 								'operation' => '=',
-							],
-						],
-					],
-					[
+							),
+						),
+					),
+					array(
 						'type'    => 'not',
-						'operand' => [
-							[
+						'operand' => array(
+							array(
 								'type'    => 'plugins_activated',
-								'plugins' => [ 'woocommerce-services' ],
-							],
-						],
-					],
-				],
+								'plugins' => array( 'woocommerce-services' ),
+							),
+						),
+					),
+				),
 				'is_built_by_wc' => true,
-			],
-			'jetpack'                           => [
+			),
+			'jetpack'                           => array(
+				'name'           => __( 'Jetpack', 'woocommerce' ),
+				'image_url'      => plugins_url( '/assets/images/onboarding/jetpack.svg', WC_PLUGIN_FILE ),
 				'description'    => sprintf(
 					/* translators: 1: opening product link tag. 2: closing link tag */
 					__( 'Enhance speed and security with %1$sJetpack%2$s', 'woocommerce' ),
 					'<a href="https://woocommerce.com/products/jetpack" target="_blank">',
 					'</a>'
 				),
-				'is_visible'     => [
-					[
+				'is_visible'     => array(
+					array(
 						'type'    => 'not',
-						'operand' => [
-							[
+						'operand' => array(
+							array(
 								'type'    => 'plugins_activated',
-								'plugins' => [ 'jetpack' ],
-							],
-						],
-					],
-				],
+								'plugins' => array( 'jetpack' ),
+							),
+						),
+					),
+				),
 				'is_built_by_wc' => false,
 				'min_wp_version' => '6.0',
-			],
-			'mailpoet'                          => [
+			),
+			'mailpoet'                          => array(
 				'name'           => __( 'MailPoet', 'woocommerce' ),
+				'image_url'      => plugins_url( '/assets/images/onboarding/mailpoet.png', WC_PLUGIN_FILE ),
 				'description'    => sprintf(
 					/* translators: 1: opening product link tag. 2: closing link tag */
 					__( 'Level up your email marketing with %1$sMailPoet%2$s', 'woocommerce' ),
@@ -530,242 +555,242 @@ class DefaultFreeExtensions {
 					'</a>'
 				),
 				'manage_url'     => 'admin.php?page=mailpoet-newsletters',
-				'is_visible'     => [
-					[
+				'is_visible'     => array(
+					array(
 						'type'    => 'not',
-						'operand' => [
-							[
+						'operand' => array(
+							array(
 								'type'    => 'plugins_activated',
-								'plugins' => [ 'mailpoet' ],
-							],
-						],
-					],
-				],
+								'plugins' => array( 'mailpoet' ),
+							),
+						),
+					),
+				),
 				'is_built_by_wc' => true,
-			],
-			'mailpoet:alt'                      => [
+			),
+			'mailpoet:alt'                      => array(
 				'name'           => __( 'MailPoet', 'woocommerce' ),
 				'description'    => __( 'Create and send purchase follow-up emails, newsletters, and promotional campaigns straight from your dashboard.', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/mailpoet.png', WC_PLUGIN_FILE ),
 				'manage_url'     => 'admin.php?page=mailpoet-newsletters',
 				'is_built_by_wc' => true,
-			],
-			'tiktok-for-business'               => [
+			),
+			'tiktok-for-business'               => array(
 				'name'           => __( 'TikTok for WooCommerce', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/tiktok.svg', WC_PLUGIN_FILE ),
 				'description'    =>
 					__( 'Grow your online sales by promoting your products on TikTok to over one billion monthly active users around the world.', 'woocommerce' ),
 				'manage_url'     => 'admin.php?page=tiktok',
-				'is_visible'     => [
-					[
+				'is_visible'     => array(
+					array(
 						'type'     => 'or',
-						'operands' => [
-							[
+						'operands' => array(
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'US',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'CA',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'MX',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'AT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'BE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'CZ',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'DK',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'FI',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'FR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'DE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'GR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'HU',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'IE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'IT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'NL',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'PL',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'PT',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'RO',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'ES',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'SE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'GB',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'CH',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'NO',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'AU',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'NZ',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'SG',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'MY',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'PH',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'ID',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'VN',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'TH',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'KR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'IL',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'AE',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'RU',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'UA',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'TR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'SA',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'BR',
 								'operation' => '=',
-							],
-							[
+							),
+							array(
 								'type'      => 'base_location_country',
 								'value'     => 'JP',
 								'operation' => '=',
-							],
-						],
-					],
-				],
+							),
+						),
+					),
+				),
 				'is_built_by_wc' => false,
-			],
-			'tiktok-for-business:alt'           => [
+			),
+			'tiktok-for-business:alt'           => array(
 				'name'           => __( 'TikTok for WooCommerce', 'woocommerce' ),
 				'image_url'      => plugins_url( '/assets/images/onboarding/tiktok.svg', WC_PLUGIN_FILE ),
 				'description'    => sprintf(
@@ -777,7 +802,7 @@ class DefaultFreeExtensions {
 				'manage_url'     => 'admin.php?page=tiktok',
 				'is_built_by_wc' => false,
 				'is_visible'     => false,
-			],
+			),
 		);
 
 		$plugin        = $plugins[ $slug ];
@@ -785,4 +810,92 @@ class DefaultFreeExtensions {
 
 		return $plugin;
 	}
+
+	/**
+	 * Decorate plugin data with core profiler fields.
+	 *
+	 * - Updated description for the core-profiler.
+	 * - Adds learn_more_link and label.
+	 *
+	 * @param array $plugins Array of plugins.
+	 *
+	 * @return array
+	 */
+	public static function with_core_profiler_fields( array $plugins ) {
+		$_plugins = array(
+			'woocommerce-payments'          => array(
+				'label'           => __( 'Get paid with WooCommerce Payments', 'woocommerce' ),
+				'description'     => __( 'Accept credit cards and other popular payment methods smoothly.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/products/woocommerce-payments',
+			),
+			'woocommerce-services:shipping' => array(
+				'label'           => __( 'Print shipping labels with WooCommerce Shipping', 'woocommerce' ),
+				'description'     => __( 'Print USPS and DHL labels directly from your dashboard and save on shipping.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/woocommerce-shipping',
+			),
+			'jetpack'                       => array(
+				'label'           => __( 'Enhance security with Jetpack', 'woocommerce' ),
+				'description'     => __( 'Get auto real-time backups, malware scans, and spam protection.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/products/jetpack',
+			),
+			'pinterest-for-woocommerce'     => array(
+				'label'           => __( 'Showcase your products with Pinterest', 'woocommerce' ),
+				'description'     => __( 'Get your products in front of a highly engaged audience.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/products/pinterest-for-woocommerce',
+			),
+			'mailpoet'                      => array(
+				'label'           => __( 'Reach your customers with MailPoet', 'woocommerce' ),
+				'description'     => __( 'Send purchase follow-up emails, newsletters, and promotional campaigns.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/products/mailpoet',
+			),
+			'tiktok-for-business'           => array(
+				'label'           => __( 'Create ad campaigns with TikTok', 'woocommerce' ),
+				'description'     => __( 'Create advertising campaigns and reach one billion global users.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/products/tiktok-for-woocommerce',
+			),
+			'google-listings-and-ads'       => array(
+				'label'           => __( 'Drive sales with Google Listings & Ads', 'woocommerce' ),
+				'description'     => __( 'Reach millions of active shoppers across Google with free product listings and ads.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/products/google-listings-and-ads',
+			),
+			'woocommerce-services:tax'      => array(
+				'label'           => __( 'Get automated tax rates with WooCommerce Tax', 'woocommerce' ),
+				'description'     => __( 'Automatically calculate how much sales tax should be collected – by city, country, or state.', 'woocommerce' ),
+				'learn_more_link' => 'https://woocommerce.com/products/tax',
+			),
+		);
+
+		$remove_plugins_activated_rule = function( $is_visible ) {
+			$is_visible = array_filter(
+				array_map(
+					function( $rule ) {
+						if ( is_object( $rule ) || ! isset( $rule['operand'] ) ) {
+							return $rule;
+						}
+
+						return array_filter(
+							$rule['operand'],
+							function( $operand ) {
+								return 'plugins_activated' !== $operand['type'];
+							}
+						);
+					},
+					$is_visible
+				)
+			);
+
+			return empty( $is_visible ) ? true : $is_visible;
+		};
+
+		foreach ( $plugins as &$plugin ) {
+			if ( isset( $_plugins[ $plugin['key'] ] ) ) {
+				$plugin = array_merge( $plugin, $_plugins[ $plugin['key'] ] );
+				if ( isset( $plugin['is_visible'] ) && is_array( $plugin['is_visible'] ) ) {
+					$plugin['is_visible'] = $remove_plugins_activated_rule( $plugin['is_visible'] );
+				}
+			}
+		}
+
+		return $plugins;
+	}
 }
diff --git a/plugins/woocommerce/src/Internal/Admin/Settings.php b/plugins/woocommerce/src/Internal/Admin/Settings.php
index 516fb1f294b..84664a4f8ac 100644
--- a/plugins/woocommerce/src/Internal/Admin/Settings.php
+++ b/plugins/woocommerce/src/Internal/Admin/Settings.php
@@ -9,6 +9,7 @@ use Automattic\WooCommerce\Admin\API\Plugins;
 use Automattic\WooCommerce\Admin\PageController;
 use Automattic\WooCommerce\Admin\API\Reports\Orders\DataStore as OrdersDataStore;
 use Automattic\WooCommerce\Admin\PluginsHelper;
+use Automattic\WooCommerce\Utilities\FeaturesUtil;
 use WC_Marketplace_Suggestions;
 
 /**
@@ -105,7 +106,7 @@ class Settings {
 	}
 
 	/**
-	 * Hooks extra neccessary data into the component settings array already set in WooCommerce core.
+	 * Hooks extra necessary data into the component settings array already set in WooCommerce core.
 	 *
 	 * @param array $settings Array of component settings.
 	 * @return array Array of component settings.
@@ -233,9 +234,30 @@ class Settings {
 		$settings['connectNonce']                     = wp_create_nonce( 'connect' );
 		$settings['wcpay_welcome_page_connect_nonce'] = wp_create_nonce( 'wcpay-connect' );
 
+		$settings['features'] = $this->get_features();
+
 		return $settings;
 	}
 
+	/**
+	 * Removes non necesary feature properties for the client side.
+	 *
+	 * @return array
+	 */
+	public function get_features() {
+		$features     = FeaturesUtil::get_features( true, true );
+		$new_features = array();
+
+		foreach ( array_keys( $features ) as $feature_id ) {
+			$new_features[ $feature_id ] = array(
+				'is_enabled'      => $features[ $feature_id ]['is_enabled'],
+				'is_experimental' => $features[ $feature_id ]['is_experimental'],
+			);
+		}
+
+		return $new_features;
+	}
+
 	/**
 	 * Register the admin settings for use in the WC REST API
 	 *
diff --git a/plugins/woocommerce/src/Internal/Admin/WCAdminAssets.php b/plugins/woocommerce/src/Internal/Admin/WCAdminAssets.php
index 59f5cd9db59..7329dd459ee 100644
--- a/plugins/woocommerce/src/Internal/Admin/WCAdminAssets.php
+++ b/plugins/woocommerce/src/Internal/Admin/WCAdminAssets.php
@@ -238,7 +238,7 @@ class WCAdminAssets {
 	}
 
 	/**
-	 * Registers all the neccessary scripts and styles to show the admin experience.
+	 * Registers all the necessary scripts and styles to show the admin experience.
 	 */
 	public function register_scripts() {
 		if ( ! function_exists( 'wp_set_script_translations' ) ) {
@@ -278,6 +278,7 @@ class WCAdminAssets {
 			'wc-date',
 			'wc-components',
 			'wc-customer-effort-score',
+			'wc-experimental',
 			WC_ADMIN_APP,
 		);
 
diff --git a/plugins/woocommerce/src/Internal/Admin/WCAdminUser.php b/plugins/woocommerce/src/Internal/Admin/WCAdminUser.php
index 748f4b96547..76897a8cf24 100644
--- a/plugins/woocommerce/src/Internal/Admin/WCAdminUser.php
+++ b/plugins/woocommerce/src/Internal/Admin/WCAdminUser.php
@@ -124,7 +124,7 @@ class WCAdminUser {
 	}
 
 	/**
-	 * Helper to retrive user data fields.
+	 * Helper to retrieve user data fields.
 	 *
 	 * Migrates old key prefixes as well.
 	 *
diff --git a/plugins/woocommerce/src/Internal/BatchProcessing/BatchProcessingController.php b/plugins/woocommerce/src/Internal/BatchProcessing/BatchProcessingController.php
index 107429ef311..04c3b8a6a36 100644
--- a/plugins/woocommerce/src/Internal/BatchProcessing/BatchProcessingController.php
+++ b/plugins/woocommerce/src/Internal/BatchProcessing/BatchProcessingController.php
@@ -138,18 +138,17 @@ class BatchProcessingController {
 			return;
 		}
 
-		$batch_processor      = $this->get_processor_instance( $processor_class_name );
-		$pending_count_before = $batch_processor->get_total_pending_count();
-		$error                = $this->process_next_batch_for_single_processor_core( $batch_processor );
-		$pending_count_after  = $batch_processor->get_total_pending_count();
-		if ( ( $error instanceof \Exception ) && $pending_count_before === $pending_count_after ) {
+		$batch_processor = $this->get_processor_instance( $processor_class_name );
+		$error           = $this->process_next_batch_for_single_processor_core( $batch_processor );
+		$still_pending   = count( $batch_processor->get_next_batch_to_process( 1 ) ) > 0;
+		if ( ( $error instanceof \Exception ) ) {
 			// The batch processing failed and no items were processed:
 			// reschedule the processing with a delay, and also throw the error
 			// so Action Scheduler will ignore the rescheduling if this happens repeatedly.
 			$this->schedule_batch_processing( $processor_class_name, true );
 			throw $error;
 		}
-		if ( $pending_count_after > 0 ) {
+		if ( $still_pending ) {
 			$this->schedule_batch_processing( $processor_class_name );
 		} else {
 			$this->dequeue_processor( $processor_class_name );
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php b/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
index 534dff796bd..77c6b62d826 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
@@ -62,7 +62,6 @@ class OrdersTableDataStore extends \Abstract_WC_Order_Data_Store_CPT implements
 		'_shipping_phone',
 		'_completed_date',
 		'_paid_date',
-		'_edit_lock',
 		'_edit_last',
 		'_cart_discount',
 		'_cart_discount_tax',
@@ -1920,7 +1919,7 @@ FROM $order_meta_table
 
 	/**
 	 * Set the parent id of child orders to the parent order's parent if the post type
-	 * for the order is hierarchical, just deletes the child orders otherwise.
+	 * for the order is hierarchical, just delete the child orders otherwise.
 	 *
 	 * @param \WC_Abstract_Order $order Order object.
 	 *
@@ -1948,10 +1947,14 @@ FROM $order_meta_table
 					$order->get_id()
 				)
 			);
-			foreach ( $child_order_ids as $child_order_id ) {
-				$this->delete_order_data_from_custom_order_tables( $child_order_id );
-			}
 			// phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+
+			foreach ( $child_order_ids as $child_order_id ) {
+				$child_order = wc_get_order( $child_order_id );
+				if ( $child_order ) {
+					$child_order->delete( true );
+				}
+			}
 		}
 	}
 
diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrderAdminServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrderAdminServiceProvider.php
index bbdd2a83d43..b78acdaf918 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrderAdminServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/OrderAdminServiceProvider.php
@@ -7,6 +7,7 @@ namespace Automattic\WooCommerce\Internal\DependencyManagement\ServiceProviders;
 
 use Automattic\WooCommerce\Internal\Admin\Orders\COTRedirectionController;
 use Automattic\WooCommerce\Internal\Admin\Orders\Edit;
+use Automattic\WooCommerce\Internal\Admin\Orders\EditLock;
 use Automattic\WooCommerce\Internal\Admin\Orders\ListTable;
 use Automattic\WooCommerce\Internal\Admin\Orders\PageController;
 use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider;
@@ -26,6 +27,7 @@ class OrderAdminServiceProvider extends AbstractServiceProvider {
 		PageController::class,
 		Edit::class,
 		ListTable::class,
+		EditLock::class,
 	);
 
 	/**
@@ -38,5 +40,6 @@ class OrderAdminServiceProvider extends AbstractServiceProvider {
 		$this->share( PageController::class );
 		$this->share( Edit::class )->addArgument( PageController::class );
 		$this->share( ListTable::class )->addArgument( PageController::class );
+		$this->share( EditLock::class );
 	}
 }
diff --git a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/UtilsClassesServiceProvider.php b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/UtilsClassesServiceProvider.php
index c6d6ea53fd3..52e25ba49f8 100644
--- a/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/UtilsClassesServiceProvider.php
+++ b/plugins/woocommerce/src/Internal/DependencyManagement/ServiceProviders/UtilsClassesServiceProvider.php
@@ -11,6 +11,7 @@ use Automattic\WooCommerce\Internal\DependencyManagement\AbstractServiceProvider
 use Automattic\WooCommerce\Internal\Utilities\COTMigrationUtil;
 use Automattic\WooCommerce\Internal\Utilities\DatabaseUtil;
 use Automattic\WooCommerce\Internal\Utilities\HtmlSanitizer;
+use Automattic\WooCommerce\Internal\Utilities\WebhookUtil;
 use Automattic\WooCommerce\Proxies\LegacyProxy;
 use Automattic\WooCommerce\Utilities\PluginUtil;
 use Automattic\WooCommerce\Utilities\OrderUtil;
@@ -31,6 +32,7 @@ class UtilsClassesServiceProvider extends AbstractServiceProvider {
 		OrderUtil::class,
 		PluginUtil::class,
 		COTMigrationUtil::class,
+		WebhookUtil::class,
 	);
 
 	/**
@@ -44,5 +46,6 @@ class UtilsClassesServiceProvider extends AbstractServiceProvider {
 			->addArgument( LegacyProxy::class );
 		$this->share( COTMigrationUtil::class )
 			->addArguments( array( CustomOrdersTableController::class, DataSynchronizer::class ) );
+		$this->share( WebhookUtil::class );
 	}
 }
diff --git a/plugins/woocommerce/src/Internal/Features/FeaturesController.php b/plugins/woocommerce/src/Internal/Features/FeaturesController.php
index e0a792920a4..24e2fcf7431 100644
--- a/plugins/woocommerce/src/Internal/Features/FeaturesController.php
+++ b/plugins/woocommerce/src/Internal/Features/FeaturesController.php
@@ -90,32 +90,32 @@ class FeaturesController {
 	 */
 	public function __construct() {
 		$features = array(
-			'analytics'              => array(
+			'analytics'            => array(
 				'name'               => __( 'Analytics', 'woocommerce' ),
 				'description'        => __( 'Enables WooCommerce Analytics', 'woocommerce' ),
 				'is_experimental'    => false,
 				'enabled_by_default' => true,
 				'disable_ui'         => false,
 			),
-			'new_navigation'         => array(
+			'new_navigation'       => array(
 				'name'            => __( 'Navigation', 'woocommerce' ),
 				'description'     => __( 'Adds the new WooCommerce navigation experience to the dashboard', 'woocommerce' ),
 				'is_experimental' => false,
 				'disable_ui'      => false,
 			),
-			'new_product_management' => array(
+			'product_block_editor' => array(
 				'name'            => __( 'New product editor', 'woocommerce' ),
 				'description'     => __( 'Try the new product editor (Beta)', 'woocommerce' ),
 				'is_experimental' => true,
 				'disable_ui'      => false,
 			),
-			'custom_order_tables'    => array(
+			'custom_order_tables'  => array(
 				'name'            => __( 'High-Performance order storage (COT)', 'woocommerce' ),
 				'description'     => __( 'Enable the high performance order storage feature.', 'woocommerce' ),
 				'is_experimental' => true,
 				'disable_ui'      => false,
 			),
-			'cart_checkout_blocks'   => array(
+			'cart_checkout_blocks' => array(
 				'name'            => __( 'Cart & Checkout Blocks', 'woocommerce' ),
 				'description'     => __( 'Optimize for faster checkout', 'woocommerce' ),
 				'is_experimental' => false,
@@ -123,7 +123,7 @@ class FeaturesController {
 			),
 		);
 
-		$this->legacy_feature_ids = array( 'analytics', 'new_navigation', 'new_product_management' );
+		$this->legacy_feature_ids = array( 'analytics', 'new_navigation' );
 
 		$this->init_features( $features );
 
@@ -409,8 +409,6 @@ class FeaturesController {
 			return Analytics::TOGGLE_OPTION_NAME;
 		} elseif ( 'new_navigation' === $feature_id ) {
 			return Init::TOGGLE_OPTION_NAME;
-		} elseif ( 'new_product_management' === $feature_id ) {
-			return NewProductManagementExperience::TOGGLE_OPTION_NAME;
 		}
 
 		return "woocommerce_feature_{$feature_id}_enabled";
@@ -480,8 +478,6 @@ class FeaturesController {
 			$feature_id = 'analytics';
 		} elseif ( Init::TOGGLE_OPTION_NAME === $option ) {
 			$feature_id = 'new_navigation';
-		} elseif ( NewProductManagementExperience::TOGGLE_OPTION_NAME === $option ) {
-			$feature_id = 'new_product_management';
 		} else {
 			$feature_id = $matches[1];
 		}
@@ -657,9 +653,11 @@ class FeaturesController {
 			}
 		}
 
-		if ( 'new_product_management' === $feature_id ) {
-			$disabled = true;
-			$desc_tip = __( '⚠ This feature will be available soon. Stay tuned!', 'woocommerce' );
+		if ( 'product_block_editor' === $feature_id ) {
+			$disabled = version_compare( get_bloginfo( 'version' ), '6.2', '<' );
+			if ( $disabled ) {
+				$desc_tip = __( '⚠ This feature is compatible with WordPress version 6.2 or higher.', 'woocommerce' );
+			}
 		}
 
 		if ( ! $this->is_legacy_feature( $feature_id ) && ! $disabled && $this->verify_did_woocommerce_init() ) {
diff --git a/plugins/woocommerce/src/Internal/Utilities/WebhookUtil.php b/plugins/woocommerce/src/Internal/Utilities/WebhookUtil.php
new file mode 100644
index 00000000000..e6ff21320f5
--- /dev/null
+++ b/plugins/woocommerce/src/Internal/Utilities/WebhookUtil.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * WebhookUtil class file.
+ */
+
+namespace Automattic\WooCommerce\Internal\Utilities;
+
+use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
+
+/**
+ * Class with utility methods for dealing with webhooks.
+ */
+class WebhookUtil {
+
+	use AccessiblePrivateMethods;
+
+	/**
+	 * Creates a new instance of the class.
+	 */
+	public function __construct() {
+		self::add_action( 'deleted_user', array( $this, 'reassign_webhooks_to_new_user_id' ), 10, 2 );
+		self::add_action( 'delete_user_form', array( $this, 'maybe_render_user_with_webhooks_warning' ), 10, 2 );
+	}
+
+	/**
+	 * Whenever a user is deleted, re-assign their webhooks to the new user.
+	 *
+	 * If re-assignment isn't selected during deletion, assign the webhooks to user_id 0,
+	 * so that an admin can edit and re-save them in order to get them to be assigned to a valid user.
+	 *
+	 * @param int      $old_user_id ID of the deleted user.
+	 * @param int|null $new_user_id ID of the user to reassign existing data to, or null if no re-assignment is requested.
+	 *
+	 * @return void
+	 * @since 7.8.0
+	 */
+	private function reassign_webhooks_to_new_user_id( int $old_user_id, ?int $new_user_id ): void {
+		$webhook_ids = $this->get_webhook_ids_for_user( $old_user_id );
+
+		foreach ( $webhook_ids as $webhook_id ) {
+			$webhook = new \WC_Webhook( $webhook_id );
+			$webhook->set_user_id( $new_user_id ?? 0 );
+			$webhook->save();
+		}
+	}
+
+	/**
+	 * When users are about to be deleted show an informative text if they have webhooks assigned.
+	 *
+	 * @param \WP_User $current_user The current logged in user.
+	 * @param array    $userids Array with the ids of the users that are about to be deleted.
+	 * @return void
+	 * @since 7.8.0
+	 */
+	private function maybe_render_user_with_webhooks_warning( \WP_User $current_user, array $userids ): void {
+		global $wpdb;
+
+		$at_least_one_user_with_webhooks = false;
+
+		foreach ( $userids as $user_id ) {
+			$webhook_ids = $this->get_webhook_ids_for_user( $user_id );
+			if ( empty( $webhook_ids ) ) {
+				continue;
+			}
+
+			$at_least_one_user_with_webhooks = true;
+
+			$user_data      = get_userdata( $user_id );
+			$user_login     = false === $user_data ? '' : $user_data->user_login;
+			$webhooks_count = count( $webhook_ids );
+
+			$text = sprintf(
+				/* translators: 1 = user id, 2 = user login, 3 = webhooks count */
+				_nx(
+					'User #%1$s %2$s has created %3$d WooCommerce webhook.',
+					'User #%1$s %2$s has created %3$d WooCommerce webhooks.',
+					$webhooks_count,
+					'user webhook count',
+					'woocommerce'
+				),
+				$user_id,
+				$user_login,
+				$webhooks_count
+			);
+
+			echo '<p>' . esc_html( $text ) . '</p>';
+		}
+
+		if ( ! $at_least_one_user_with_webhooks ) {
+			return;
+		}
+
+		$webhooks_settings_url = esc_url_raw( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks' ) );
+
+		// This block of code is copied from WordPress' users.php.
+		// phpcs:disable WooCommerce.Commenting.CommentHooks, WordPress.DB.PreparedSQL.NotPrepared
+		$users_have_content = (bool) apply_filters( 'users_have_additional_content', false, $userids );
+		if ( ! $users_have_content ) {
+			if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+				$users_have_content = true;
+			} elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+				$users_have_content = true;
+			}
+		}
+		// phpcs:enable WooCommerce.Commenting.CommentHooks, WordPress.DB.PreparedSQL.NotPrepared
+
+		if ( $users_have_content ) {
+			$text = __( 'If the "Delete all content" option is selected, the affected WooCommerce webhooks will <b>not</b> be deleted and will be attributed to user id 0.<br/>', 'woocommerce' );
+		} else {
+			$text = __( 'The affected WooCommerce webhooks will <b>not</b> be deleted and will be attributed to user id 0.<br/>', 'woocommerce' );
+		}
+
+		$text .= sprintf(
+			/* translators: 1 = url of the WooCommerce webhooks settings page */
+			__( 'After that they can be reassigned to the logged-in user by going to the <a href="%1$s">WooCommerce webhooks settings page</a> and re-saving them.', 'woocommerce' ),
+			$webhooks_settings_url
+		);
+
+		echo '<p>' . wp_kses_post( $text ) . '</p>';
+	}
+
+	/**
+	 * Get the ids of the webhooks assigned to a given user.
+	 *
+	 * @param int $user_id User id.
+	 * @return int[] Array of webhook ids.
+	 */
+	private function get_webhook_ids_for_user( int $user_id ): array {
+		$data_store = \WC_Data_Store::load( 'webhook' );
+		return $data_store->search_webhooks(
+			array(
+				'user_id' => $user_id,
+			)
+		);
+	}
+}
diff --git a/plugins/woocommerce/templates/cart/cart.php b/plugins/woocommerce/templates/cart/cart.php
index a8f8c22d83d..9c7ac4c73d3 100644
--- a/plugins/woocommerce/templates/cart/cart.php
+++ b/plugins/woocommerce/templates/cart/cart.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce\Templates
- * @version 7.4.0
+ * @version 7.8.0
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -40,6 +40,13 @@ do_action( 'woocommerce_before_cart' ); ?>
 			foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
 				$_product   = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
 				$product_id = apply_filters( 'woocommerce_cart_item_product_id', $cart_item['product_id'], $cart_item, $cart_item_key );
+				/**
+				 * Filter the product name.
+				 *
+				 * @since 7.8.0
+				 * @param string $product_name Name of the product in the cart.
+				 */
+				$product_name = apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key );
 
 				if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_cart_item_visible', true, $cart_item, $cart_item_key ) ) {
 					$product_permalink = apply_filters( 'woocommerce_cart_item_permalink', $_product->is_visible() ? $_product->get_permalink( $cart_item ) : '', $cart_item, $cart_item_key );
@@ -53,7 +60,8 @@ do_action( 'woocommerce_before_cart' ); ?>
 									sprintf(
 										'<a href="%s" class="remove" aria-label="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
 										esc_url( wc_get_cart_remove_url( $cart_item_key ) ),
-										esc_html__( 'Remove this item', 'woocommerce' ),
+										/* translators: %s is the product name */
+										esc_attr( sprintf( __( 'Remove %s from cart', 'woocommerce' ), $product_name ) ),
 										esc_attr( $product_id ),
 										esc_attr( $_product->get_sku() )
 									),
@@ -77,9 +85,23 @@ do_action( 'woocommerce_before_cart' ); ?>
 						<td class="product-name" data-title="<?php esc_attr_e( 'Product', 'woocommerce' ); ?>">
 						<?php
 						if ( ! $product_permalink ) {
-							echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key ) . '&nbsp;' );
+							/**
+							 * Filter the product name.
+							 *
+							 * @since 7.8.0
+							 * @param string $product_name Name of the product in the cart.
+							 * @param array $cart_item The product in the cart.
+							 * @param string $cart_item_key Key for the product in the cart.
+							 */
+							echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', $product_name, $cart_item, $cart_item_key ) . '&nbsp;' );
 						} else {
-							echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', sprintf( '<a href="%s">%s</a>', esc_url( $product_permalink ), $_product->get_name() ), $cart_item, $cart_item_key ) );
+							/**
+							 * Filter the product name.
+							 *
+							 * @since 7.8.0
+							 * @param string $product_url URL the product in the cart.
+							 */
+							echo wp_kses_post( apply_filters( 'woocommerce_cart_item_name', sprintf( '<a href="%s">%s</a>', esc_url( $product_permalink ), $product_name ), $cart_item, $cart_item_key ) );
 						}
 
 						do_action( 'woocommerce_after_cart_item_name', $cart_item, $cart_item_key );
@@ -116,7 +138,7 @@ do_action( 'woocommerce_before_cart' ); ?>
 								'input_value'  => $cart_item['quantity'],
 								'max_value'    => $max_quantity,
 								'min_value'    => $min_quantity,
-								'product_name' => $_product->get_name(),
+								'product_name' => $product_name,
 							),
 							$_product,
 							false
@@ -144,7 +166,7 @@ do_action( 'woocommerce_before_cart' ); ?>
 
 					<?php if ( wc_coupons_enabled() ) { ?>
 						<div class="coupon">
-							<label for="coupon_code" class="screen-reader-text"><?php esc_html_e( 'Coupon:', 'woocommerce' ); ?></label> <input type="text" name="coupon_code" class="input-text" id="coupon_code" value="" placeholder="<?php esc_attr_e( 'Coupon code', 'woocommerce' ); ?>" /> <button type="submit" class="button<?php echo esc_attr( wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '' ); ?>" name="apply_coupon" value="<?php esc_attr_e( 'Apply coupon', 'woocommerce' ); ?>"><?php esc_attr_e( 'Apply coupon', 'woocommerce' ); ?></button>
+							<label for="coupon_code" class="screen-reader-text"><?php esc_html_e( 'Coupon:', 'woocommerce' ); ?></label> <input type="text" name="coupon_code" class="input-text" id="coupon_code" value="" placeholder="<?php esc_attr_e( 'Coupon code', 'woocommerce' ); ?>" /> <button type="submit" class="button<?php echo esc_attr( wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '' ); ?>" name="apply_coupon" value="<?php esc_attr_e( 'Apply coupon', 'woocommerce' ); ?>"><?php esc_html_e( 'Apply coupon', 'woocommerce' ); ?></button>
 							<?php do_action( 'woocommerce_cart_coupon' ); ?>
 						</div>
 					<?php } ?>
diff --git a/plugins/woocommerce/templates/cart/mini-cart.php b/plugins/woocommerce/templates/cart/mini-cart.php
index a3c1ecf2e4e..d0e0b181a55 100644
--- a/plugins/woocommerce/templates/cart/mini-cart.php
+++ b/plugins/woocommerce/templates/cart/mini-cart.php
@@ -14,7 +14,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce\Templates
- * @version 5.2.0
+ * @version 7.8.0
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -32,6 +32,11 @@ do_action( 'woocommerce_before_mini_cart' ); ?>
 			$product_id = apply_filters( 'woocommerce_cart_item_product_id', $cart_item['product_id'], $cart_item, $cart_item_key );
 
 			if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_widget_cart_item_visible', true, $cart_item, $cart_item_key ) ) {
+				/**
+				 * Filter the product name.
+				 *
+				 * @param string $product_name Name of the product in the cart.
+				 */
 				$product_name      = apply_filters( 'woocommerce_cart_item_name', $_product->get_name(), $cart_item, $cart_item_key );
 				$thumbnail         = apply_filters( 'woocommerce_cart_item_thumbnail', $_product->get_image(), $cart_item, $cart_item_key );
 				$product_price     = apply_filters( 'woocommerce_cart_item_price', WC()->cart->get_product_price( $_product ), $cart_item, $cart_item_key );
@@ -44,7 +49,8 @@ do_action( 'woocommerce_before_mini_cart' ); ?>
 						sprintf(
 							'<a href="%s" class="remove remove_from_cart_button" aria-label="%s" data-product_id="%s" data-cart_item_key="%s" data-product_sku="%s">&times;</a>',
 							esc_url( wc_get_cart_remove_url( $cart_item_key ) ),
-							esc_attr__( 'Remove this item', 'woocommerce' ),
+							/* translators: %s is the product name */
+							esc_attr( sprintf( __( 'Remove %s from cart', 'woocommerce' ), $product_name ) ),
 							esc_attr( $product_id ),
 							esc_attr( $cart_item_key ),
 							esc_attr( $_product->get_sku() )
diff --git a/plugins/woocommerce/templates/myaccount/downloads.php b/plugins/woocommerce/templates/myaccount/downloads.php
index 7d445faacdd..4139ea47ab3 100644
--- a/plugins/woocommerce/templates/myaccount/downloads.php
+++ b/plugins/woocommerce/templates/myaccount/downloads.php
@@ -36,7 +36,11 @@ do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?>
 
 <?php else : ?>
 
-	<?php wc_print_notice( esc_html__( 'No downloads available yet.', 'woocommerce' ) . ' <a class="woocommerce-Button button" href="' . esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ) . '">' . esc_html__( 'Browse products', 'woocommerce' ) . '</a>', 'notice' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment ?>
+	<?php
+
+	$wp_button_class = wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '';
+	wc_print_notice( esc_html__( 'No downloads available yet.', 'woocommerce' ) . ' <a class="button wc-forward' . esc_attr( $wp_button_class ) . '" href="' . esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ) . '">' . esc_html__( 'Browse products', 'woocommerce' ) . '</a>', 'notice' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment 
+	?>
 
 <?php endif; ?>
 
diff --git a/plugins/woocommerce/templates/myaccount/orders.php b/plugins/woocommerce/templates/myaccount/orders.php
index 315f9a25fd1..6e6ad423a53 100644
--- a/plugins/woocommerce/templates/myaccount/orders.php
+++ b/plugins/woocommerce/templates/myaccount/orders.php
@@ -86,18 +86,18 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?>
 	<?php if ( 1 < $customer_orders->max_num_pages ) : ?>
 		<div class="woocommerce-pagination woocommerce-pagination--without-numbers woocommerce-Pagination">
 			<?php if ( 1 !== $current_page ) : ?>
-				<a class="woocommerce-button woocommerce-button--previous woocommerce-Button woocommerce-Button--previous button" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page - 1 ) ); ?>"><?php esc_html_e( 'Previous', 'woocommerce' ); ?></a>
+				<a class="woocommerce-button woocommerce-button--previous woocommerce-Button woocommerce-Button--previous button<?php echo esc_attr( $wp_button_class ); ?>" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page - 1 ) ); ?>"><?php esc_html_e( 'Previous', 'woocommerce' ); ?></a>
 			<?php endif; ?>
 
 			<?php if ( intval( $customer_orders->max_num_pages ) !== $current_page ) : ?>
-				<a class="woocommerce-button woocommerce-button--next woocommerce-Button woocommerce-Button--next button" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page + 1 ) ); ?>"><?php esc_html_e( 'Next', 'woocommerce' ); ?></a>
+				<a class="woocommerce-button woocommerce-button--next woocommerce-Button woocommerce-Button--next button<?php echo esc_attr( $wp_button_class ); ?>" href="<?php echo esc_url( wc_get_endpoint_url( 'orders', $current_page + 1 ) ); ?>"><?php esc_html_e( 'Next', 'woocommerce' ); ?></a>
 			<?php endif; ?>
 		</div>
 	<?php endif; ?>
 
 <?php else : ?>
 
-	<?php wc_print_notice( esc_html__( 'No order has been made yet.', 'woocommerce' ) . ' <a class="woocommerce-Button button" href="' . esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ) . '">' . esc_html__( 'Browse products', 'woocommerce' ) . '</a>', 'notice' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment ?>
+	<?php wc_print_notice( esc_html__( 'No order has been made yet.', 'woocommerce' ) . ' <a class="woocommerce-Button button' . esc_attr( $wp_button_class ) . '" href="' . esc_url( apply_filters( 'woocommerce_return_to_shop_redirect', wc_get_page_permalink( 'shop' ) ) ) . '">' . esc_html__( 'Browse products', 'woocommerce' ) . '</a>', 'notice' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment ?>
 
 <?php endif; ?>
 
diff --git a/plugins/woocommerce/templates/order/order-again.php b/plugins/woocommerce/templates/order/order-again.php
index f7bc2242cdd..f7202ff7e49 100644
--- a/plugins/woocommerce/templates/order/order-again.php
+++ b/plugins/woocommerce/templates/order/order-again.php
@@ -12,12 +12,12 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce\Templates
- * @version 3.5.0
+ * @version 7.8.0
  */
 
 defined( 'ABSPATH' ) || exit;
 ?>
 
 <p class="order-again">
-	<a href="<?php echo esc_url( $order_again_url ); ?>" class="button"><?php esc_html_e( 'Order again', 'woocommerce' ); ?></a>
+	<a href="<?php echo esc_url( $order_again_url ); ?>" class="button<?php echo esc_attr( $wp_button_class ); ?>"><?php esc_html_e( 'Order again', 'woocommerce' ); ?></a>
 </p>
diff --git a/plugins/woocommerce/tests/Tools/CodeHacking/CodeHacker.php b/plugins/woocommerce/tests/Tools/CodeHacking/CodeHacker.php
index 9b18bbe214c..94669c2a8e0 100644
--- a/plugins/woocommerce/tests/Tools/CodeHacking/CodeHacker.php
+++ b/plugins/woocommerce/tests/Tools/CodeHacking/CodeHacker.php
@@ -466,7 +466,7 @@ final class CodeHacker {
 	}
 
 	/**
-	 * Apply the reigstered hacks to the contents of a file.
+	 * Apply the registered hacks to the contents of a file.
 	 *
 	 * @param string $code Code content to hack.
 	 * @param string $path Path of the file being hacked.
diff --git a/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php b/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php
index cf3fc83c6ab..b37edc6ae77 100644
--- a/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php
+++ b/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/FunctionsMockerHack.php
@@ -86,7 +86,7 @@ final class FunctionsMockerHack extends CodeHack {
 	}
 
 	/**
-	 * Hacks code by replacing elegible function invocations with an invocation to this class' static method with the same name.
+	 * Hacks code by replacing eligible function invocations with an invocation to this class' static method with the same name.
 	 *
 	 * @param string $code The code to hack.
 	 * @param string $path The path of the file containing the code to hack.
diff --git a/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php b/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php
index 65b5b334aca..034eac10824 100644
--- a/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php
+++ b/plugins/woocommerce/tests/Tools/CodeHacking/Hacks/StaticMockerHack.php
@@ -72,7 +72,7 @@ final class StaticMockerHack extends CodeHack {
 	}
 
 	/**
-	 * Hacks code by replacing elegible method invocations with an invocation a static method on this class composed from the class and the method names.
+	 * Hacks code by replacing eligible method invocations with an invocation a static method on this class composed from the class and the method names.
 	 *
 	 * @param string $code The code to hack.
 	 * @param string $path The path of the file containing the code to hack.
diff --git a/plugins/woocommerce/tests/Tools/CodeHacking/README.md b/plugins/woocommerce/tests/Tools/CodeHacking/README.md
index f4beef28b68..bcb657fc1d2 100644
--- a/plugins/woocommerce/tests/Tools/CodeHacking/README.md
+++ b/plugins/woocommerce/tests/Tools/CodeHacking/README.md
@@ -125,7 +125,7 @@ StaticMockerHack::add_method_mocks([
 
 Inside your test files you can create classes that extend classes marked as `final` thanks to the `BypassFinalsHack` that is registered at bootstrap time. No extra configuration is needed.
 
-If you want to try it out, mark the `WC_Admin_Foobar` in the previos example as `final`, then add the following to the tests file: `class WC_Admin_Foobar_Subclass extends WC_Admin_Foobar {}`. Without the hack you would get a `Class WC_Admin_Foobar_Subclass may not inherit from final class (WC_Admin_Foobar)` error when trying to run the tests. 
+If you want to try it out, mark the `WC_Admin_Foobar` in the previous example as `final`, then add the following to the tests file: `class WC_Admin_Foobar_Subclass extends WC_Admin_Foobar {}`. Without the hack you would get a `Class WC_Admin_Foobar_Subclass may not inherit from final class (WC_Admin_Foobar)` error when trying to run the tests. 
 
 ## How it works under the hood
 
diff --git a/plugins/woocommerce/tests/api-core-tests/tests/payment-gateways/payment-gateways-crud.test.js b/plugins/woocommerce/tests/api-core-tests/tests/payment-gateways/payment-gateways-crud.test.js
index cdc7509c080..8f5f09d45ae 100644
--- a/plugins/woocommerce/tests/api-core-tests/tests/payment-gateways/payment-gateways-crud.test.js
+++ b/plugins/woocommerce/tests/api-core-tests/tests/payment-gateways/payment-gateways-crud.test.js
@@ -12,7 +12,7 @@ const {
  */
 test.describe('Payment Gateways API tests', () => {
 
-	test('can view all payment gatways', async ({
+	test('can view all payment gateways', async ({
 		request
 	}) => {
 		// call API to retrieve the payment gateways
@@ -167,7 +167,7 @@ test.describe('Payment Gateways API tests', () => {
 	test('can view a payment gateway', async ({
 		request
 	}) => {
-		// call API to retrieve a single payment gatway
+		// call API to retrieve a single payment gateway
 		const response = await request.get('/wp-json/wc/v3/payment_gateways/bacs');
 		const responseJSON = await response.json();
 		expect(response.status()).toEqual(200);
@@ -213,7 +213,7 @@ test.describe('Payment Gateways API tests', () => {
 	test('can update a payment gateway', async ({
 		request
 	}) => {
-		// call API to update a payment gatway
+		// call API to update a payment gateway
 		const response = await request.put('/wp-json/wc/v3/payment_gateways/bacs', {
 			data: {
 				enabled: true
diff --git a/plugins/woocommerce/tests/api-core-tests/tests/products/products-crud.test.js b/plugins/woocommerce/tests/api-core-tests/tests/products/products-crud.test.js
index 00fcd5b58d7..908493c166e 100644
--- a/plugins/woocommerce/tests/api-core-tests/tests/products/products-crud.test.js
+++ b/plugins/woocommerce/tests/api-core-tests/tests/products/products-crud.test.js
@@ -265,7 +265,7 @@ test.describe('Products API tests: CRUD', () => {
 			expect(responseJSON.type).toEqual('select');
 			expect(responseJSON.order_by).toEqual('name');
 			// the below has_archives test is currently not working as expected
-			// an issue (https://github.com/woocommerce/woocommerce/issues/34991)
+			// an issue (https://github.com/woocommerce/woocommerce/issues/34991) 
 			// has been raised and this test can be
 			// updated as appropriate after triage
 			// expect(responseJSON.has_archives).toEqual(true);
@@ -558,7 +558,7 @@ test.describe('Products API tests: CRUD', () => {
 			const response = await request.post('wp-json/wc/v3/products/reviews', {
 				data: {
 					product_id: 999,
-					review: "A non existant product!",
+					review: "A non existent product!",
 					reviewer: "John Do Not",
 					reviewer_email: "john.do.not@example.com",
 					rating: 5
@@ -913,6 +913,7 @@ test.describe('Products API tests: CRUD', () => {
 		});
 	});
 
+
 	test.describe('Product tags tests: CRUD', () => {
 		let productTagId;
 
@@ -1073,235 +1074,6 @@ test.describe('Products API tests: CRUD', () => {
 		});
 	});
 
-	test.describe( 'Product images tests: CRUD', () => {
-		let productId;
-		let images;
-
-		test( 'can add product with an image', async ( { request } ) => {
-			const response = await request.post( 'wp-json/wc/v3/products', {
-				data: {
-					images: [ { src: 'https://cldup.com/6L9h56D9Bw.jpg' } ],
-				},
-			} );
-			const responseJSON = await response.json();
-
-			expect( response.status() ).toEqual( 201 );
-			expect( responseJSON.images ).toHaveLength( 1 );
-			expect( responseJSON.images[ 0 ].name ).toContain( '6L9h56D9Bw' );
-			expect( responseJSON.images[ 0 ].featured ).toBeTruthy();
-			expect( responseJSON.images[ 0 ].alt ).toEqual( '' );
-			expect( responseJSON.images[ 0 ].src ).toContain( '6L9h56D9Bw' );
-
-			// Cleanup: Delete the used product
-			await request.delete(
-				`wp-json/wc/v3/products/${ responseJSON.id }`,
-				{
-					data: {
-						force: true,
-					},
-				}
-			);
-		} );
-
-		test( 'can add product with multiple images (backward compatible)', async ( {
-			request,
-		} ) => {
-			const response = await request.post( 'wp-json/wc/v3/products', {
-				data: {
-					images: [
-						{ src: 'https://cldup.com/6L9h56D9Bw.jpg' },
-						{ src: 'https://cldup.com/Dr1Bczxq4q.png' },
-					],
-				},
-			} );
-			const responseJSON = await response.json();
-			productId = responseJSON.id;
-			images = responseJSON.images.map( ( image ) => image.id );
-
-			expect( response.status() ).toEqual( 201 );
-			expect( responseJSON.images ).toHaveLength( 2 );
-			expect( responseJSON.images[ 0 ].name ).toContain( '6L9h56D9Bw' );
-			expect( responseJSON.images[ 0 ].featured ).toBeTruthy();
-			expect( responseJSON.images[ 1 ].name ).toContain( 'Dr1Bczxq4q' );
-			expect( responseJSON.images[ 1 ].featured ).toBeFalsy();
-		} );
-
-		test( 'can add product with multiple images (explicit featured)', async ( {
-			request,
-		} ) => {
-			const response = await request.post( 'wp-json/wc/v3/products', {
-				data: {
-					images: [
-						{
-							src: 'https://cldup.com/6L9h56D9Bw.jpg',
-							featured: false,
-						},
-						{
-							src: 'https://cldup.com/Dr1Bczxq4q.png',
-							featured: true,
-						},
-					],
-				},
-			} );
-			const responseJSON = await response.json();
-
-			expect( response.status() ).toEqual( 201 );
-			expect( responseJSON.images ).toHaveLength( 2 );
-			// When retrieving, the featured image is always the first one.
-			expect( responseJSON.images[ 0 ].name ).toContain( 'Dr1Bczxq4q' );
-			expect( responseJSON.images[ 0 ].featured ).toBeTruthy();
-			expect( responseJSON.images[ 1 ].name ).toContain( '6L9h56D9Bw' );
-			expect( responseJSON.images[ 1 ].featured ).toBeFalsy();
-
-			// Cleanup: Delete the used product
-			await request.delete(
-				`wp-json/wc/v3/products/${ responseJSON.id }`,
-				{
-					data: {
-						force: true,
-					},
-				}
-			);
-		} );
-
-		test( 'can add product with multiple images (no featured)', async ( {
-			request,
-		} ) => {
-			const response = await request.post( 'wp-json/wc/v3/products', {
-				data: {
-					images: [
-						{
-							src: 'https://cldup.com/6L9h56D9Bw.jpg',
-							featured: false,
-						},
-						{
-							src: 'https://cldup.com/Dr1Bczxq4q.png',
-							featured: false,
-						},
-					],
-				},
-			} );
-			const responseJSON = await response.json();
-
-			expect( response.status() ).toEqual( 201 );
-			expect( responseJSON.images ).toHaveLength( 2 );
-			expect( responseJSON.images[ 0 ].name ).toContain( '6L9h56D9Bw' );
-			expect( responseJSON.images[ 0 ].alt ).toEqual( '' );
-			expect( responseJSON.images[ 0 ].featured ).toBeFalsy();
-			expect( responseJSON.images[ 1 ].name ).toContain( 'Dr1Bczxq4q' );
-			expect( responseJSON.images[ 1 ].alt ).toEqual( '' );
-			expect( responseJSON.images[ 1 ].featured ).toBeFalsy();
-
-			// Cleanup: Delete the used product
-			await request.delete(
-				`wp-json/wc/v3/products/${ responseJSON.id }`,
-				{
-					data: {
-						force: true,
-					},
-				}
-			);
-		} );
-
-		test( 'cannot add product with multiple images (all featured)', async ( {
-			request,
-		} ) => {
-			const response = await request.post( 'wp-json/wc/v3/products', {
-				data: {
-					images: [
-						{
-							src: 'https://cldup.com/6L9h56D9Bw.jpg',
-							featured: true,
-						},
-						{
-							src: 'https://cldup.com/Dr1Bczxq4q.png',
-							featured: true,
-						},
-					],
-				},
-			} );
-			const responseJSON = await response.json();
-
-			expect( response.status() ).toEqual( 400 );
-			expect( responseJSON.code ).toEqual(
-				'woocommerce_rest_product_featured_image_count'
-			);
-			expect( responseJSON.message ).toEqual(
-				'Only one featured image is allowed.'
-			);
-			expect( responseJSON.data ).toEqual( { status: 400 } );
-		} );
-
-		test( 'can retrieve product images', async ( { request } ) => {
-			const response = await request.get(
-				`wp-json/wc/v3/products/${ productId }`
-			);
-			const responseJSON = await response.json();
-
-			expect( response.status() ).toEqual( 200 );
-			expect( responseJSON.images ).toHaveLength( 2 );
-			expect( responseJSON.images[ 0 ].id ).toEqual( images[ 0 ] );
-			expect( responseJSON.images[ 0 ].name ).toContain( '6L9h56D9Bw' );
-			expect( responseJSON.images[ 0 ].alt ).toEqual( '' );
-			expect( responseJSON.images[ 0 ].featured ).toBeTruthy();
-		} );
-
-		test( 'can update a product images', async ( { request } ) => {
-			// call API to update a product
-			const response = await request.put(
-				`wp-json/wc/v3/products/${ productId }`,
-				{
-					data: {
-						images: [
-							{ id: images[ 0 ], featured: false },
-							{ id: images[ 1 ], featured: true },
-						],
-					},
-				}
-			);
-			const responseJSON = await response.json();
-
-			expect( response.status() ).toEqual( 200 );
-			expect( responseJSON.images ).toHaveLength( 2 );
-			// When retrieving, the featured image is always the first one.
-			expect( responseJSON.images[ 0 ].id ).toEqual( images[ 1 ] );
-			expect( responseJSON.images[ 0 ].name ).toContain( 'Dr1Bczxq4q' );
-			expect( responseJSON.images[ 0 ].alt ).toEqual( '' );
-			expect( responseJSON.images[ 0 ].featured ).toBeTruthy();
-			expect( responseJSON.images[ 1 ].id ).toEqual( images[ 0 ] );
-			expect( responseJSON.images[ 1 ].name ).toContain( '6L9h56D9Bw' );
-			expect( responseJSON.images[ 1 ].alt ).toEqual( '' );
-			expect( responseJSON.images[ 1 ].featured ).toBeFalsy();
-		} );
-
-		test( 'can remove an image from a product', async ( { request } ) => {
-			// Delete the product attribute.
-			const response = await request.put(
-				`wp-json/wc/v3/products/${ productId }`,
-				{
-					data: {
-						images: [ { id: images[ 1 ] } ],
-					},
-				}
-			);
-			const responseJSON = await response.json();
-
-			expect( response.status() ).toEqual( 200 );
-			expect( responseJSON.images ).toHaveLength( 1 );
-			expect( responseJSON.images[ 0 ].id ).toEqual( images[ 1 ] );
-			expect( responseJSON.images[ 0 ].name ).toContain( 'Dr1Bczxq4q' );
-			expect( responseJSON.images[ 0 ].alt ).toEqual( '' );
-			expect( responseJSON.images[ 0 ].featured ).toBeTruthy();
-
-			// Cleanup: Delete the used product
-			await request.delete( `wp-json/wc/v3/products/${ productId }`, {
-				data: {
-					force: true,
-				},
-			} );
-		} );
-	} );
-
 	test('can add a virtual product', async ({
 		request
 	}) => {
diff --git a/plugins/woocommerce/tests/api-core-tests/tests/settings/settings-crud.test.js b/plugins/woocommerce/tests/api-core-tests/tests/settings/settings-crud.test.js
index f5314972d76..238a4c552c0 100644
--- a/plugins/woocommerce/tests/api-core-tests/tests/settings/settings-crud.test.js
+++ b/plugins/woocommerce/tests/api-core-tests/tests/settings/settings-crud.test.js
@@ -1968,7 +1968,7 @@ test.describe('Settings API tests: CRUD', () => {
 
 	test.describe('List all Email Customer Processing Order settings', () => {
 
-		test('can retrieve all email customer processsing order settings', async ({
+		test('can retrieve all email customer processing order settings', async ({
 			request
 		}) => {
 			// call API to retrieve all settings options
diff --git a/plugins/woocommerce/tests/api-core-tests/tests/shipping/shipping-zones.test.js b/plugins/woocommerce/tests/api-core-tests/tests/shipping/shipping-zones.test.js
index ef948dea1c4..af6cb93e4ce 100644
--- a/plugins/woocommerce/tests/api-core-tests/tests/shipping/shipping-zones.test.js
+++ b/plugins/woocommerce/tests/api-core-tests/tests/shipping/shipping-zones.test.js
@@ -78,7 +78,7 @@ test.describe( 'Shipping zones API tests', () => {
 	} );
 
 	test( 'can retrieve a shipping zone', async ({request}) => {
-		//call API to retrive the created shipping zone
+		//call API to retrieve the created shipping zone
 		const response = await request.get( `/wp-json/wc/v3/shipping/zones/${shippingZone.id}`);
 		const responseJSON = await response.json();
 
@@ -88,7 +88,7 @@ test.describe( 'Shipping zones API tests', () => {
 	} );
 	
 	test( 'can list all shipping zones', async ({request}) => {
-		//call API to retrive all the shipping zones
+		//call API to retrieve all the shipping zones
 		const response = await request.get( 'wp-json/wc/v3/shipping/zones');
 		const responseJSON = await response.json();
 
@@ -119,7 +119,7 @@ test.describe( 'Shipping zones API tests', () => {
 
 	test( 'can add a shipping region to a shipping zone', async ({request}) => {
 
-		//call API to retrive the locations of the last created shipping zone
+		//call API to retrieve the locations of the last created shipping zone
 		const response = await request.get( `/wp-json/wc/v3/shipping/zones/${shippingZone.id}/locations`);
 		expect( response.status() ).toEqual( 200 );
 		
diff --git a/plugins/woocommerce/tests/api-core-tests/tests/system-status/system-status-crud.test.js b/plugins/woocommerce/tests/api-core-tests/tests/system-status/system-status-crud.test.js
index 4518718914c..28f30c6f45d 100644
--- a/plugins/woocommerce/tests/api-core-tests/tests/system-status/system-status-crud.test.js
+++ b/plugins/woocommerce/tests/api-core-tests/tests/system-status/system-status-crud.test.js
@@ -550,7 +550,7 @@ test.describe('System Status API tests', () => {
 	test('can retrieve a system status tool', async ({
 		request
 	}) => {
-		// call API to retrieve a system staus tool
+		// call API to retrieve a system status tool
 		const response = await request.get('/wp-json/wc/v3/system_status/tools/clear_transients');
 		const responseJSON = await response.json();
 		expect(response.status()).toEqual(200);
diff --git a/plugins/woocommerce/tests/e2e-pw/README.md b/plugins/woocommerce/tests/e2e-pw/README.md
index 51e62700679..a42c8fbcd68 100644
--- a/plugins/woocommerce/tests/e2e-pw/README.md
+++ b/plugins/woocommerce/tests/e2e-pw/README.md
@@ -53,6 +53,12 @@ Other ways of running tests (make sure you are in the `plugins/woocommerce` fold
 -   `pnpm test:e2e-pw --headed` (headed -- displaying browser window and test interactions)
 -   `pnpm test:e2e-pw --debug` (runs tests in debug mode)
 -   `pnpm test:e2e-pw ./tests/e2e-pw/tests/activate-and-setup/basic-setup.spec.js` (runs a single test)
+-   `pnpm test:e2e-pw --ui` (open tests in [Playwright UI mode](https://playwright.dev/docs/test-ui-mode)). You may need to increase the [test timeout](https://playwright.dev/docs/api/class-testconfig#test-config-timeout) by setting the `DEFAULT_TIMEOUT_OVERRIDE` environment variable like so:
+    ```bash
+    # Increase test timeout to 3 minutes
+    export DEFAULT_TIMEOUT_OVERRIDE=180000
+    pnpm test:e2e-pw --ui
+    ```
 
 To see all options, make sure you are in the `plugins/woocommerce` folder and run `pnpm playwright test --help`
 
@@ -60,30 +66,12 @@ To see all options, make sure you are in the `plugins/woocommerce` folder and ru
 
 The default values are:
 
--   Latest stable WordPress version 
--   PHP 7.4
--   MariaDB
--   URL: `http://localhost:8086/`
--   Admin credentials: `admin/password`
-
-If you want to customize the port or admin credentials, check the [Test Variables](#test-variables) section.
-
-If you would like to customize the `PHP`, `WordPress` or `WooCommerce` versions installed in the environment, you can define `UPDATE_WP_JSON_FILE=1` along with any or all of the following env vars when building the environment.
-- `WP_VERSION`
-  - Acceptable versions are `nightly`, `trunk`, and any version listed on [WordPress Releases] page.
-- `WC_VERSION`
-  - Acceptable versions can be found on the [WooCommerce Releases](https://github.com/woocommerce/woocommerce/releases) page
-- `PHP`
-  - Any PHP version you see it. Please note that WooCommerce requries a minimum of PHP 7.2.
-
-**Example**
-
-The command below will create and environment with WordPress version 6.2, WooCommerce version 7.5.1 and PHP version 8.2 installed.
-
-`UPDATE_WP_JSON_FILE=1 WP_VERSION=6.2 WC_TEST_VERSION=7.5.1 PHP_VERSION=8.2 pnpm run env:test`
-
-If you'd like to run with the default configuation, simply remove the `UPDATE_WP_JSON_FILE`.
-
+- Latest stable WordPress version
+- PHP 7.4
+- Latest stable WordPress version
+- MariaDB
+- URL: `http://localhost:8086/`
+- Admin credentials: `admin/password`
 
 For more information how to configure the test environment for `wp-env`, please checkout the [documentation](https://github.com/WordPress/gutenberg/tree/trunk/packages/env) documentation.
 
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh b/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh
index 32662b68a5c..446bdaaccf5 100755
--- a/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh
+++ b/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh
@@ -4,21 +4,14 @@ ENABLE_HPOS="${ENABLE_HPOS:-0}"
 ENABLE_NEW_PRODUCT_EDITOR="${ENABLE_NEW_PRODUCT_EDITOR:-0}"
 ENABLE_TRACKING="${ENABLE_TRACKING:-0}"
 
-echo -e 'Normalize permissions for wp-content directory \n'
-docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-wordpress sh -c "chmod -c ugo+w /var/www/html/wp-config.php \
-&& chmod -c ugo+w /var/www/html/wp-content \
-&& chmod -c ugo+w /var/www/html/wp-content/themes \
-&& chmod -c ugo+w /var/www/html/wp-content/plugins \
-&& mkdir -p /var/www/html/wp-content/upgrade \
-&& chmod -c ugo+w /var/www/html/wp-content/upgrade"
+echo -e 'Activate twentynineteen theme \n'
+wp-env run tests-cli "wp theme activate twentynineteen"
 
-docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-cli sh -c "ls \
-&& wp theme install twentynineteen --activate \
-&& wp plugin install https://github.com/WP-API/Basic-Auth/archive/master.zip --activate \
-&& wp plugin install wp-mail-logging --activate \
-&& wp plugin install https://github.com/woocommerce/woocommerce-reset/archive/refs/heads/trunk.zip --activate \
-&& wp rewrite structure '/%postname%/' --hard \
-&& wp user create customer customer@woocommercecoree2etestsuite.com \
+echo -e 'Update URL structure \n'
+wp-env run tests-cli "wp rewrite structure '/%postname%/' --hard"
+
+echo -e 'Add Customer user \n'
+wp-env run tests-cli "wp user create customer customer@woocommercecoree2etestsuite.com \
 	--user_pass=password \
 	--role=subscriber \
 	--first_name='Jane' \
@@ -26,19 +19,23 @@ docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data
 	--user_registered='2022-01-01 12:23:45'"
 
 echo -e 'Update Blog Name \n'
-docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u $(id -u) -e HOME=/tmp tests-cli sh -c 'wp option update blogname "WooCommerce Core E2E Test Suite"'
+wp-env run tests-cli "wp option update blogname 'WooCommerce Core E2E Test Suite'"
+
+echo -e 'Preparing Test Files \n'
+wp-env run tests-cli "sudo cp /var/www/html/wp-content/plugins/woocommerce/tests/legacy/unit-tests/importer/sample.csv \
+	/var/www/sample.csv"
 
 if [ $ENABLE_HPOS == 1 ]; then
-	echo 'Enable the COT feature'
-	docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-cli sh -c "wp plugin install https://gist.github.com/vedanshujain/564afec8f5e9235a1257994ed39b1449/archive/b031465052fc3e04b17624acbeeb2569ef4d5301.zip --activate"
+	echo -e 'Enable High-Performance Order Tables\n'
+	wp-env run tests-cli "wp plugin install https://gist.github.com/vedanshujain/564afec8f5e9235a1257994ed39b1449/archive/b031465052fc3e04b17624acbeeb2569ef4d5301.zip --activate"
 fi
 
 if [ $ENABLE_NEW_PRODUCT_EDITOR == 1 ]; then
-	echo 'Enable the new product editor feature'
-	docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-cli sh -c "wp plugin install https://github.com/woocommerce/woocommerce-experimental-enable-new-product-editor/releases/download/0.1.0/woocommerce-experimental-enable-new-product-editor.zip --activate"
+	echo -e 'Enable the new product editor feature\n'
+	wp-env run tests-cli "wp plugin install https://github.com/woocommerce/woocommerce-experimental-enable-new-product-editor/releases/download/0.1.0/woocommerce-experimental-enable-new-product-editor.zip --activate"
 fi
 
 if [ $ENABLE_TRACKING == 1 ]; then
-	echo 'Enable tracking'
-	docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u $(id -u) -e HOME=/tmp tests-cli sh -c "wp option update woocommerce_allow_tracking 'yes'"
+	echo -e 'Enable tracking\n'
+	wp-env run tests-cli "wp option update woocommerce_allow_tracking 'yes'"
 fi
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/update-wp-env.php b/plugins/woocommerce/tests/e2e-pw/bin/update-wp-env.php
deleted file mode 100644
index dcb87a7b56c..00000000000
--- a/plugins/woocommerce/tests/e2e-pw/bin/update-wp-env.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-// phpcs:ignoreFile
-
-if ( ! class_exists( UPDATE_WP_JSON::class ) ) {
-	class UPDATE_WP_JSON {
-
-		private $wp_env_path  = __DIR__ . '/../../../.wp-env.json';
-		private $wp_json      = [];
-		private $wc_version   = null;
-		private $wp_version   = null;
-		private $php_version  = null;
-
-		public function __construct() {
-			if ( file_exists( $this->wp_env_path ) ) {
-				$this->wp_json = json_decode( file_get_contents( $this->wp_env_path ), true );
-			} else {
-				throw new Exception( ".wp-env.json doesn't exist!" );
-			}
-
-			$env = getenv();
-
-			$this->wp_version  = isset( $env['WP_VERSION'] ) ? $env['WP_VERSION'] : null;
-			$this->wc_version  = isset( $env['WC_TEST_VERSION'] ) ? $env['WC_TEST_VERSION'] : null;
-			$this->php_version = isset( $env['PHP_VERSION'] ) ? $env['PHP_VERSION'] : null;
-		}
-
-		public function set_wp_version(){
-			if ( $this->wp_version ) {
-
-				$version = "WordPress/WordPress#tags/$this->wp_version";
-
-				if ( 'trunk' === $this->wp_version ) {
-					$version = "WordPress/WordPress";
-				}
-
-				if ( 'nightly' === $this->wp_version ) {
-					$version = "https://wordpress.org/nightly-builds/wordpress-latest.zip";
-				}
-
-				echo "Set WP Version to $version \n";
-				$this->wp_json["core"] = $version;
-			}
-		}
-
-		public function revert_wp_version(){
-			unset( $this->wp_json["core"] );
-		}
-
-		public function set_wc_version(){
-			if ( $this->wc_version ) {
-				echo "Set WC Version to $this->wc_version \n";
-				$this->wp_json["plugins"] = [ "https://github.com/woocommerce/woocommerce/releases/download/$this->wc_version/woocommerce.zip" ];
-			}
-		}
-
-		public function revert_wc_version(){
-			$this->wp_json["plugins"] = [ "." ];
-		}
-
-		public function set_php_version(){
-			if ( $this->php_version ) {
-				echo "Set PHP Version to $this->php_version \n";
-				$this->wp_json["phpVersion"] = $this->php_version;
-			}
-		}
-
-		public function revert_php_version(){
-			$this->wp_json["phpVersion"] = "7.4";
-		}
-
-		public function update(){
-			$this->set_wp_version();
-			$this->set_wc_version();
-			$this->set_php_version();
-			file_put_contents( $this->wp_env_path, json_encode( $this->wp_json, JSON_PRETTY_PRINT ) );
-		}
-
-		public function revert(){
-			$this->revert_wp_version();
-			$this->revert_wc_version();
-			$this->revert_php_version();
-			file_put_contents( $this->wp_env_path, json_encode( $this->wp_json, JSON_PRETTY_PRINT ) );
-
-			echo "Reverted .wp-env.json \n";
-		}
-	}
-}
-
-
-$env = getenv();
-$update_wp_json = isset( $env['UPDATE_WP_JSON_FILE'] ) ? $env['UPDATE_WP_JSON_FILE'] : null;
-
-if ( is_null( $update_wp_json ) || $update_wp_json == false ) {
-	$wp_json = new UPDATE_WP_JSON();
-	$wp_json->revert();
-} else {
-	$wp_json = new UPDATE_WP_JSON();
-	$wp_json->update();
-}
diff --git a/plugins/woocommerce/tests/e2e-pw/daily.playwright.config.js b/plugins/woocommerce/tests/e2e-pw/daily.playwright.config.js
deleted file mode 100644
index 3a344940aac..00000000000
--- a/plugins/woocommerce/tests/e2e-pw/daily.playwright.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const defaultConfig = require( './playwright.config' );
-
-const config = {
-	...defaultConfig,
-	testIgnore: '**/shopper/**',
-};
-
-module.exports = config;
diff --git a/plugins/woocommerce/tests/e2e-pw/playwright.config.js b/plugins/woocommerce/tests/e2e-pw/playwright.config.js
index 49f76e255bd..ba8bcf300a5 100644
--- a/plugins/woocommerce/tests/e2e-pw/playwright.config.js
+++ b/plugins/woocommerce/tests/e2e-pw/playwright.config.js
@@ -11,7 +11,7 @@ const {
 const config = {
 	timeout: DEFAULT_TIMEOUT_OVERRIDE
 		? Number( DEFAULT_TIMEOUT_OVERRIDE )
-		: 90 * 1000,
+		: 120 * 1000,
 	expect: { timeout: 20 * 1000 },
 	outputDir: './test-results/report',
 	globalSetup: require.resolve( './global-setup' ),
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-coupon.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-coupon.spec.js
index eb98753bdac..80e94ef6ed0 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-coupon.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-coupon.spec.js
@@ -29,14 +29,20 @@ test.describe( 'Add New Coupon Page', () => {
 			waitUntil: 'networkidle',
 		} );
 
-		await page.fill( '#title', couponCode );
+		await page.locator( '#title' ).fill( couponCode );
 
-		await page.fill( '#woocommerce-coupon-description', 'test coupon' );
+		// Blur then wait for the auto-save to finish
+		await page.locator( '#title' ).blur();
+		await page.waitForLoadState( 'networkidle' );
 
-		await page.fill( '#coupon_amount', '100' );
+		await page
+			.locator( '#woocommerce-coupon-description' )
+			.fill( 'test coupon' );
 
-		await expect( page.locator( '#publish:not(.disabled)' ) ).toBeVisible();
-		await page.click( '#publish' );
+		await page.locator( '#coupon_amount' ).fill( '100' );
+
+		await page.locator( '#publish:not(.disabled)' ).click();
+		await page.waitForLoadState( 'networkidle' );
 
 		await expect(
 			page
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-page.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-page.spec.js
new file mode 100644
index 00000000000..80c5566569a
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-page.spec.js
@@ -0,0 +1,73 @@
+const { test, expect, request } = require( '@playwright/test' );
+const { admin } = require( '../../test-data/data' );
+
+const pageTitle = `Page-${ new Date().getTime().toString() }`;
+
+test.describe( 'Can create a new page', () => {
+	test.use( { storageState: process.env.ADMINSTATE } );
+
+	test.afterAll( async ( { baseURL } ) => {
+		const base64auth = Buffer.from(
+			`${ admin.username }:${ admin.password }`
+		).toString( 'base64' );
+		const wpApi = await request.newContext( {
+			baseURL: `${ baseURL }/wp-json/wp/v2/`,
+			extraHTTPHeaders: {
+				Authorization: `Basic ${ base64auth }`,
+			},
+		} );
+
+		let response = await wpApi.get( `pages` );
+		const allPages = await response.json();
+
+		await allPages.forEach( async ( page ) => {
+			if ( page.title.rendered === pageTitle ) {
+				response = await wpApi.delete( `pages/${ page.id }`, {
+					data: {
+						force: true,
+					},
+				} );
+			}
+		} );
+	} );
+
+	test( 'can create new page', async ( { page } ) => {
+		await page.goto( 'wp-admin/post-new.php?post_type=page' );
+
+		const welcomeModalVisible = await page
+			.getByRole( 'heading', {
+				name: 'Welcome to the block editor',
+			} )
+			.isVisible();
+
+		if ( welcomeModalVisible ) {
+			await page.getByRole( 'button', { name: 'Close' } ).click();
+		}
+
+		await page
+			.getByRole( 'textbox', { name: 'Add Title' } )
+			.fill( pageTitle );
+
+		await page.getByRole( 'button', { name: 'Add default block' } ).click();
+
+		await page
+			.getByRole( 'document', {
+				name:
+					'Empty block; start writing or type forward slash to choose a block',
+			} )
+			.fill( 'Test Page' );
+
+		await page
+			.getByRole( 'button', { name: 'Publish', exact: true } )
+			.click();
+
+		await page
+			.getByRole( 'region', { name: 'Editor publish' } )
+			.getByRole( 'button', { name: 'Publish', exact: true } )
+			.click();
+
+		await expect(
+			page.getByText( `${ pageTitle } is now live.` )
+		).toBeVisible();
+	} );
+} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-post.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-post.spec.js
new file mode 100644
index 00000000000..5f368776d48
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-post.spec.js
@@ -0,0 +1,88 @@
+const { test, expect, request } = require( '@playwright/test' );
+const { admin } = require( '../../test-data/data' );
+
+const postTitle = `Post-${ new Date().getTime().toString() }`;
+
+test.describe( 'Can create a new post', () => {
+	test.use( { storageState: process.env.ADMINSTATE } );
+
+	test.afterAll( async ( { baseURL } ) => {
+		const base64auth = Buffer.from(
+			`${ admin.username }:${ admin.password }`
+		).toString( 'base64' );
+		const wpApi = await request.newContext( {
+			baseURL: `${ baseURL }/wp-json/wp/v2/`,
+			extraHTTPHeaders: {
+				Authorization: `Basic ${ base64auth }`,
+			},
+		} );
+
+		let response = await wpApi.get( `posts` );
+		const allPosts = await response.json();
+
+		await allPosts.forEach( async ( post ) => {
+			if ( post.title.rendered === postTitle ) {
+				response = await wpApi.delete( `posts/${ post.id }`, {
+					data: {
+						force: true,
+					},
+				} );
+//				expect( response.ok() ).toBeTruthy();
+			}
+		} );
+	} );
+
+	test( 'can create new post', async ( { page } ) => {
+		await page.goto( 'wp-admin/post-new.php' );
+
+		const welcomeModalVisible = await test.step(
+			'Check if the Welcome modal appeared',
+			async () => {
+				return await page
+					.getByRole( 'heading', {
+						name: 'Welcome to the block editor',
+					} )
+					.isVisible();
+			}
+		);
+
+		if ( welcomeModalVisible ) {
+			await test.step( 'Welcome modal appeared. Close it.', async () => {
+				await page
+					.getByRole( 'document' )
+					.getByRole( 'button', { name: 'Close' } )
+					.click();
+			} );
+		} else {
+			await test.step( 'Welcome modal did not appear.', async () => {
+				// do nothing.
+			} );
+		}
+
+		await page
+			.getByRole( 'textbox', { name: 'Add Title' } )
+			.fill( postTitle );
+
+		await page.getByRole( 'button', { name: 'Add default block' } ).click();
+
+		await page
+			.getByRole( 'document', {
+				name:
+					'Empty block; start writing or type forward slash to choose a block',
+			} )
+			.fill( 'Test Post' );
+
+		await page
+			.getByRole( 'button', { name: 'Publish', exact: true } )
+			.click();
+
+		await page
+			.getByRole( 'region', { name: 'Editor publish' } )
+			.getByRole( 'button', { name: 'Publish', exact: true } )
+			.click();
+
+		await expect(
+			page.getByText( `${ postTitle } is now live.` )
+		).toBeVisible();
+	} );
+} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-variable-product.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-variable-product.spec.js
deleted file mode 100644
index fff8cfaee16..00000000000
--- a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-variable-product.spec.js
+++ /dev/null
@@ -1,881 +0,0 @@
-const { test, expect } = require( '@playwright/test' );
-const wcApi = require( '@woocommerce/woocommerce-rest-api' ).default;
-
-const productPageURL = 'wp-admin/post-new.php?post_type=product';
-
-const variableProductName = 'Variable Product with Three Variations';
-const manualVariableProduct = 'Manual Variable Product';
-const variationOnePrice = '9.99';
-const variationTwoPrice = '11.99';
-const variationThreePrice = '20.00';
-const productWeight = '200';
-const productLength = '10';
-const productWidth = '20';
-const productHeight = '15';
-const defaultAttributes = [ 'val2', 'val1', 'val2' ];
-const stockAmount = '100';
-const lowStockAmount = '10';
-
-let fixedVariableProductId;
-let fixedVariationIds;
-
-async function deleteProductsAddedByTests( baseURL ) {
-	const api = new wcApi( {
-		url: baseURL,
-		consumerKey: process.env.CONSUMER_KEY,
-		consumerSecret: process.env.CONSUMER_SECRET,
-		version: 'wc/v3',
-	} );
-
-	const varProducts = await api
-		.get( 'products', { per_page: 100, search: variableProductName } )
-		.then( ( response ) => response.data );
-
-	const manualProducts = await api
-		.get( 'products', { per_page: 100, search: manualVariableProduct } )
-		.then( ( response ) => response.data );
-
-	const ids = varProducts
-		.map( ( { id } ) => id )
-		.concat( manualProducts.map( ( { id } ) => id ) )
-		.concat( [ fixedVariableProductId ] );
-
-	await api.post( 'products/batch', { delete: ids } );
-}
-
-async function resetVariableProductTour( page ) {
-	await test.step(
-		'Go to the product page, so that the `window.wp.data` module is available',
-		async () => {
-			await page.goto( productPageURL );
-		}
-	);
-
-	const { id: userId, woocommerce_meta } = await test.step(
-		"Get the current user's ID and user preferences",
-		async () => {
-			return await page.evaluate( () => {
-				return window.wp.data.select( 'core' ).getCurrentUser();
-			} );
-		}
-	);
-
-	const updatedWooCommerceMeta = await test.step(
-		'Reset the variable product tour preference, so that it will be shown again',
-		async () => {
-			return {
-				...woocommerce_meta,
-				variable_product_tour_shown: '',
-			};
-		}
-	);
-
-	await test.step( 'Save the updated user preferences', async () => {
-		await page.evaluate(
-			async ( { userId, updatedWooCommerceMeta } ) => {
-				await window.wp.data.dispatch( 'core' ).saveUser( {
-					id: userId,
-					woocommerce_meta: updatedWooCommerceMeta,
-				} );
-			},
-			{ userId, updatedWooCommerceMeta }
-		);
-	} );
-}
-
-async function createVariableProductFixture( baseURL ) {
-	const api = new wcApi( {
-		url: baseURL,
-		consumerKey: process.env.CONSUMER_KEY,
-		consumerSecret: process.env.CONSUMER_SECRET,
-		version: 'wc/v3',
-	} );
-
-	const createVariableProductRequestPayload = {
-		name: 'Unbranded Granite Shirt',
-		type: 'variable',
-		attributes: [
-			{
-				name: 'Colour',
-				visible: true,
-				variation: true,
-				options: [ 'Red', 'Green' ],
-			},
-			{
-				name: 'Size',
-				visible: true,
-				variation: true,
-				options: [ 'Small', 'Medium' ],
-			},
-			{
-				name: 'Logo',
-				visible: true,
-				variation: true,
-				options: [ 'Woo', 'WordPress' ],
-			},
-		],
-	};
-
-	const batchCreateVariationsPayload = {
-		create: [
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Red' },
-					{ name: 'Size', option: 'Small' },
-					{ name: 'Logo', option: 'Woo' },
-				],
-			},
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Red' },
-					{ name: 'Size', option: 'Small' },
-					{ name: 'Logo', option: 'WordPress' },
-				],
-			},
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Red' },
-					{ name: 'Size', option: 'Medium' },
-					{ name: 'Logo', option: 'Woo' },
-				],
-			},
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Red' },
-					{ name: 'Size', option: 'Medium' },
-					{ name: 'Logo', option: 'WordPress' },
-				],
-			},
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Green' },
-					{ name: 'Size', option: 'Small' },
-					{ name: 'Logo', option: 'Woo' },
-				],
-			},
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Green' },
-					{ name: 'Size', option: 'Small' },
-					{ name: 'Logo', option: 'WordPress' },
-				],
-			},
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Green' },
-					{ name: 'Size', option: 'Medium' },
-					{ name: 'Logo', option: 'Woo' },
-				],
-			},
-			{
-				attributes: [
-					{ name: 'Colour', option: 'Green' },
-					{ name: 'Size', option: 'Medium' },
-					{ name: 'Logo', option: 'WordPress' },
-				],
-			},
-		],
-	};
-
-	await test.step(
-		'Create the variable product and its attributes.',
-		async () => {
-			await api
-				.post( 'products', createVariableProductRequestPayload )
-				.then( ( response ) => {
-					fixedVariableProductId = response.data.id;
-				} );
-		}
-	);
-
-	await test.step( 'Generate all variations.', async () => {
-		await api
-			.post(
-				`products/${ fixedVariableProductId }/variations/batch`,
-				batchCreateVariationsPayload
-			)
-			.then( ( response ) => {
-				fixedVariationIds = response.data.create
-					.map( ( variation ) => variation.id )
-					.sort();
-			} );
-	} );
-}
-
-test.describe( 'Add New Variable Product Page', () => {
-	test.use( { storageState: process.env.ADMINSTATE } );
-
-	test.beforeAll( async ( { baseURL } ) => {
-		await test.step(
-			'Set up a variable product fixture through the REST API.',
-			async () => {
-				await createVariableProductFixture( baseURL );
-			}
-		);
-	} );
-
-	test.afterAll( async ( { baseURL } ) => {
-		await deleteProductsAddedByTests( baseURL );
-	} );
-
-	test( 'can create product, attributes and variations', async ( {
-		page,
-	} ) => {
-		await test.step( 'Reset the variable product tour.', async () => {
-			await resetVariableProductTour( page );
-		} );
-
-		await test.step( 'Go to "Products > Add new" page.', async () => {
-			await page.goto( productPageURL );
-		} );
-
-		await test.step(
-			`Type "${ variableProductName }" into the "Product name" input field.`,
-			async () => {
-				await page
-					.getByLabel( 'Product name' )
-					.fill( variableProductName );
-			}
-		);
-
-		await test.step(
-			'Select the "Variable product" product type.',
-			async () => {
-				await page.selectOption( '#product-type', 'variable' );
-			}
-		);
-
-		await test.step(
-			'Scroll into the "Attributes" tab and click it.',
-			async () => {
-				const attributesTab = page
-					.locator( '.attribute_tab' )
-					.getByRole( 'link', { name: 'Attributes' } );
-
-				await attributesTab.scrollIntoViewIfNeeded();
-
-				await attributesTab.click();
-			}
-		);
-
-		// the tour only seems to display when not running headless, so just make sure
-		const tourWasDisplayed = await test.step(
-			'See if the tour was displayed.',
-			async () => {
-				return await page
-					.locator( '.woocommerce-tour-kit-step__heading' )
-					.isVisible();
-			}
-		);
-
-		if ( tourWasDisplayed ) {
-			await test.step( 'Tour was displayed, so dismiss it.', async () => {
-				await page
-					.getByRole( 'button', { name: 'Close Tour' } )
-					.click();
-			} );
-
-			await test.step(
-				"Wait for the tour's dismissal to be saved",
-				async () => {
-					await page.waitForResponse(
-						( response ) =>
-							response.url().includes( '/users/' ) &&
-							response.status() === 200
-					);
-				}
-			);
-		}
-
-		await test.step( 'Add 3 attributes.', async () => {
-			for ( let i = 0; i < 3; i++ ) {
-				if ( i > 0 ) {
-					await test.step( "Click 'Add'.", async () => {
-						await page
-							.locator( '.add-attribute-container' )
-							.getByRole( 'button', { name: 'Add' } )
-							.click();
-					} );
-				}
-
-				await test.step(
-					`Add the attribute "attr #${
-						i + 1
-					}" with values "val1 | val2"`,
-					async () => {
-						await test.step(
-							'Wait for the "Attribute name" input field to appear.',
-							async () => {
-								await page.waitForSelector(
-									`input[name="attribute_names[${ i }]"]`
-								);
-							}
-						);
-
-						await test.step(
-							`Type "attr #${
-								i + 1
-							}" in the "Attribute name" input field.`,
-							async () => {
-								await page
-									.locator(
-										`input[name="attribute_names[${ i }]"]`
-									)
-									.first()
-									.type( `attr #${ i + 1 }` );
-							}
-						);
-
-						await test.step(
-							'Type the attribute values "val1 | val2".',
-							async () => {
-								await page
-									.locator(
-										`textarea[name="attribute_values[${ i }]"]`
-									)
-									.first()
-									.type( 'val1 | val2' );
-							}
-						);
-
-						await test.step(
-							'Click "Save attributes".',
-							async () => {
-								await page
-									.getByRole( 'button', {
-										name: 'Save attributes',
-									} )
-									.click( { clickCount: 3 } );
-							}
-						);
-
-						await test.step(
-							"Wait for the tour's dismissal to be saved",
-							async () => {
-								await page.waitForResponse(
-									( response ) =>
-										response
-											.url()
-											.includes( '/post.php' ) &&
-										response.status() === 200
-								);
-							}
-						);
-					}
-				);
-			}
-		} );
-
-		await test.step(
-			'Save before going to the Variations tab to prevent variations from all attributes to be automatically created.',
-			async () => {
-				await page.locator( '#save-post' ).click();
-			}
-		);
-
-		await test.step(
-			'Expect the "Product draft updated." notice to appear.',
-			async () => {
-				await expect(
-					page.getByText( 'Product draft updated. ' )
-				).toBeVisible();
-			}
-		);
-
-		await test.step( 'Click on the "Variations" tab.', async () => {
-			await page.click( 'a[href="#variable_product_options"]' );
-		} );
-
-		await test.step(
-			'Click on the "Generate variations" button.',
-			async () => {
-				// event listener for handling the link_all_variations confirmation dialog
-				page.on( 'dialog', ( dialog ) => dialog.accept() );
-
-				await page.click( 'button.generate_variations' );
-			}
-		);
-
-		await test.step(
-			'Expect variations to have the correct attribute values',
-			async () => {
-				for ( let i = 0; i < 8; i++ ) {
-					const val1 = 'val1';
-					const val2 = 'val2';
-					const attr3 = !! ( i % 2 ); // 0-1,4-5 / 2-3,6-7
-					const attr2 = i % 4 > 1; // 0-3 / 4-7
-					const attr1 = i > 3;
-					await expect(
-						page.locator(
-							`select[name="attribute_attr-1[${ i }]"]`
-						)
-					).toHaveValue( attr1 ? val2 : val1 );
-					await expect(
-						page.locator(
-							`select[name="attribute_attr-2[${ i }]"]`
-						)
-					).toHaveValue( attr2 ? val2 : val1 );
-					await expect(
-						page.locator(
-							`select[name="attribute_attr-3[${ i }]"]`
-						)
-					).toHaveValue( attr3 ? val2 : val1 );
-				}
-			}
-		);
-
-		await test.step( 'Click "Save Draft" button.', async () => {
-			await page.locator( '#save-post' ).click();
-		} );
-
-		await test.step(
-			'Expect the "Product draft updated." notice to appear.',
-			async () => {
-				await expect(
-					page.locator( '#message.notice-success' )
-				).toContainText( 'Product draft updated.' );
-			}
-		);
-	} );
-
-	test( 'can individually edit variations', async ( { page } ) => {
-		const variationRows = page.locator( '.woocommerce_variation' );
-		const firstVariation = variationRows.filter( {
-			hasText: `#${ fixedVariationIds[ 0 ] }`,
-		} );
-		const secondVariation = variationRows.filter( {
-			hasText: `#${ fixedVariationIds[ 1 ] }`,
-		} );
-		const thirdVariation = variationRows.filter( {
-			hasText: `#${ fixedVariationIds[ 2 ] }`,
-		} );
-
-		await test.step( 'Go to the "Edit product" page.', async () => {
-			await page.goto(
-				`/wp-admin/post.php?post=${ fixedVariableProductId }&action=edit`
-			);
-		} );
-
-		await test.step( 'Click on the "Variations" tab.', async () => {
-			await page.click( 'a[href="#variable_product_options"]' );
-		} );
-
-		await test.step( 'Expand all variations.', async () => {
-			await page.click(
-				'#variable_product_options .toolbar-top a.expand_all'
-			);
-		} );
-
-		await test.step( 'Edit the first variation.', async () => {
-			await test.step( 'Check the "Virtual" checkbox.', async () => {
-				await firstVariation
-					.getByRole( 'checkbox', {
-						name: 'Virtual',
-					} )
-					.check();
-			} );
-
-			await test.step(
-				`Set regular price to "${ variationOnePrice }".`,
-				async () => {
-					await firstVariation
-						.getByRole( 'textbox', { name: 'Regular price' } )
-						.fill( variationOnePrice );
-				}
-			);
-		} );
-
-		await test.step( 'Edit the second variation.', async () => {
-			await test.step( 'Check the "Virtual" checkbox.', async () => {
-				await secondVariation
-					.getByRole( 'checkbox', {
-						name: 'Virtual',
-					} )
-					.check();
-			} );
-
-			await test.step(
-				`Set regular price to "${ variationTwoPrice }".`,
-				async () => {
-					await secondVariation
-						.getByRole( 'textbox', { name: 'Regular price' } )
-						.fill( variationTwoPrice );
-				}
-			);
-		} );
-
-		await test.step( 'Edit the third variation.', async () => {
-			await test.step( 'Check "Manage stock?"', async () => {
-				await thirdVariation
-					.getByRole( 'checkbox', { name: 'Manage stock?' } )
-					.check();
-			} );
-
-			await test.step(
-				`Set regular price to "${ variationThreePrice }".`,
-				async () => {
-					await thirdVariation
-						.getByRole( 'textbox', { name: 'Regular price' } )
-						.fill( variationThreePrice );
-				}
-			);
-
-			await test.step( 'Set the weight and dimensions.', async () => {
-				await thirdVariation
-					.getByRole( 'textbox', { name: 'Weight' } )
-					.type( productWeight );
-
-				await thirdVariation
-					.getByRole( 'textbox', { name: 'Length' } )
-					.type( productLength );
-
-				await thirdVariation
-					.getByRole( 'textbox', { name: 'Width' } )
-					.type( productWidth );
-
-				await thirdVariation
-					.getByRole( 'textbox', { name: 'Height' } )
-					.type( productHeight );
-			} );
-		} );
-
-		await test.step( 'Click "Save changes".', async () => {
-			await page.click( 'button.save-variation-changes' );
-			await page.waitForLoadState( 'networkidle' );
-		} );
-
-		await test.step( 'Click on the "Variations" tab.', async () => {
-			await page.click( 'a[href="#variable_product_options"]' );
-		} );
-
-		await test.step( 'Expand all variations.', async () => {
-			await page.click(
-				'#variable_product_options .toolbar-top a.expand_all'
-			);
-		} );
-
-		await test.step(
-			'Expect the first variation to be virtual.',
-			async () => {
-				await expect(
-					firstVariation.getByRole( 'checkbox', {
-						name: 'Virtual',
-					} )
-				).toBeChecked();
-			}
-		);
-
-		await test.step(
-			`Expect the regular price of the first variation to be "${ variationOnePrice }".`,
-			async () => {
-				await expect(
-					firstVariation.getByRole( 'textbox', {
-						name: 'Regular price',
-					} )
-				).toHaveValue( variationOnePrice );
-			}
-		);
-
-		await test.step(
-			'Expect the second variation to be virtual.',
-			async () => {
-				await expect(
-					secondVariation.getByRole( 'checkbox', {
-						name: 'Virtual',
-					} )
-				).toBeChecked();
-			}
-		);
-
-		await test.step(
-			`Expect the regular price of the second variation to be "${ variationTwoPrice }".`,
-			async () => {
-				await expect(
-					secondVariation.getByRole( 'textbox', {
-						name: 'Regular price',
-					} )
-				).toHaveValue( variationTwoPrice );
-			}
-		);
-
-		await test.step(
-			'Expect the "Manage stock?" checkbox of the third variation to be checked.',
-			async () => {
-				await expect(
-					thirdVariation.getByRole( 'checkbox', {
-						name: 'Manage stock?',
-					} )
-				).toBeChecked();
-			}
-		);
-
-		await test.step(
-			`Expect the regular price of the third variation to be "${ variationThreePrice }".`,
-			async () => {
-				await expect(
-					thirdVariation.getByRole( 'textbox', {
-						name: 'Regular price',
-					} )
-				).toHaveValue( variationThreePrice );
-			}
-		);
-
-		await test.step(
-			'Expect the weight and dimensions of the third variation to be correct.',
-			async () => {
-				await expect(
-					thirdVariation.getByRole( 'textbox', { name: 'Weight' } )
-				).toHaveValue( productWeight );
-
-				await expect(
-					thirdVariation.getByRole( 'textbox', { name: 'Length' } )
-				).toHaveValue( productLength );
-
-				await expect(
-					thirdVariation.getByRole( 'textbox', { name: 'Width' } )
-				).toHaveValue( productWidth );
-
-				await expect(
-					thirdVariation.getByRole( 'textbox', { name: 'Height' } )
-				).toHaveValue( productHeight );
-			}
-		);
-	} );
-
-	test( 'can bulk edit variations', async ( { page } ) => {
-		await test.step( 'Go to the "Edit product" page.', async () => {
-			await page.goto(
-				`/wp-admin/post.php?post=${ fixedVariableProductId }&action=edit`
-			);
-		} );
-
-		await test.step( 'Click on the "Variations" tab.', async () => {
-			await page.click( 'a[href="#variable_product_options"]' );
-		} );
-
-		await test.step(
-			'Select the \'Toggle "Downloadable"\' bulk action.',
-			async () => {
-				await page.selectOption(
-					'#field_to_edit',
-					'toggle_downloadable'
-				);
-			}
-		);
-
-		await test.step( 'Expand all variations.', async () => {
-			await page.click(
-				'#variable_product_options .toolbar-top a.expand_all'
-			);
-		} );
-
-		await test.step(
-			'Expect all "Downloadable" checkboxes to be checked.',
-			async () => {
-				const checkBoxes = page.locator(
-					'input[name^="variable_is_downloadable"]'
-				);
-				const count = await checkBoxes.count();
-
-				for ( let i = 0; i < count; i++ ) {
-					await expect( checkBoxes.nth( i ) ).toBeChecked();
-				}
-			}
-		);
-	} );
-
-	test( 'can delete all variations', async ( { page } ) => {
-		await test.step( 'Go to the "Edit product" page.', async () => {
-			await page.goto(
-				`/wp-admin/post.php?post=${ fixedVariableProductId }&action=edit`
-			);
-		} );
-
-		await test.step( 'Click on the "Variations" tab.', async () => {
-			await page.click( 'a[href="#variable_product_options"]' );
-		} );
-
-		await test.step(
-			'Select the bulk action "Delete all variations".',
-			async () => {
-				page.on( 'dialog', ( dialog ) => dialog.accept() );
-				await page.selectOption( '#field_to_edit', 'delete_all' );
-			}
-		);
-
-		await test.step(
-			'Expect that there are no more variations.',
-			async () => {
-				await expect(
-					page.locator( '.woocommerce_variation' )
-				).toHaveCount( 0 );
-			}
-		);
-	} );
-
-	test( 'can manually add a variation, manage stock levels, set variation defaults and remove a variation', async ( {
-		page,
-	} ) => {
-		await page.goto( productPageURL );
-		await page.getByLabel( 'Product name' ).fill( manualVariableProduct );
-		await page.selectOption( '#product-type', 'variable' );
-
-		await page
-			.locator( '.attribute_tab' )
-			.getByRole( 'link', { name: 'Attributes' } )
-			.scrollIntoViewIfNeeded();
-
-		// the tour only seems to display when not running headless, so just make sure
-		if (
-			await page
-				.locator( '.woocommerce-tour-kit-step__heading' )
-				.isVisible()
-		) {
-			// dismiss the variable product tour
-			await page.getByRole( 'button', { name: 'Close Tour' } ).click();
-
-			// wait for the tour's dismissal to be saved
-			await page.waitForResponse(
-				( response ) =>
-					response.url().includes( '/users/' ) &&
-					response.status() === 200
-			);
-		}
-
-		await page.click( 'a[href="#product_attributes"]' );
-		// add 3 attributes
-		for ( let i = 0; i < 3; i++ ) {
-			if ( i > 0 ) {
-				await page.click( 'button.add_attribute' );
-			}
-			await page.waitForSelector(
-				`input[name="attribute_names[${ i }]"]`
-			);
-
-			await page
-				.locator( `input[name="attribute_names[${ i }]"]` )
-				.first()
-				.type( `attr #${ i + 1 }` );
-			await page
-				.locator( `textarea[name="attribute_values[${ i }]"]` )
-				.first()
-				.type( 'val1 | val2' );
-		}
-		await page.click( 'text=Save attributes' );
-		// wait for the attributes to be saved
-		await page.waitForResponse(
-			( response ) =>
-				response.url().includes( '/post.php?post=' ) &&
-				response.status() === 200
-		);
-
-		// Save before going to the Variations tab to prevent variations from all attributes to be automatically created
-		await page.locator( '#save-post' ).click();
-		await expect(
-			page.getByText( 'Product draft updated. ' )
-		).toBeVisible();
-		await page.click( '.updated.notice .notice-dismiss' );
-
-		// manually adds a variation
-		await page.click( 'a[href="#variable_product_options"]' );
-		await page.click( 'button.add_variation_manually' );
-		await expect( page.locator( '.variation-needs-update' ) ).toBeVisible();
-		for ( let i = 0; i < defaultAttributes.length; i++ ) {
-			await page.selectOption(
-				`.variation-needs-update h3 select >> nth=${ i }`,
-				defaultAttributes[ i ]
-			);
-		}
-		await page.click( 'button.save-variation-changes' );
-		for ( let i = 0; i < defaultAttributes.length; i++ ) {
-			await expect(
-				page
-					.locator( '.woocommerce_variation' )
-					.first()
-					.locator( 'select' )
-					.nth( i )
-					.locator( 'option[selected]' )
-			).toHaveText( defaultAttributes[ i ] );
-		}
-
-		await page.locator( '#save-post' ).click();
-		await expect(
-			page.getByText( 'Product draft updated. ' )
-		).toBeVisible();
-
-		// manage stock at variation level
-		await page.click( 'a[href="#variable_product_options"]' );
-		await page.waitForLoadState( 'networkidle' );
-		await page.click(
-			'#variable_product_options .toolbar-top a.expand_all'
-		);
-		await page.check( 'input.checkbox.variable_manage_stock' );
-
-		const firstVariationContainer = await page
-			.locator( '.woocommerce_variations  .woocommerce_variation' )
-			.first();
-
-		await firstVariationContainer
-			.getByPlaceholder( 'Variation price (required)' )
-			.fill( variationOnePrice );
-		await expect(
-			page.locator( 'p.variable_stock_status' )
-		).not.toBeVisible();
-		await firstVariationContainer
-			.getByLabel( 'Stock quantity' )
-			.nth(1)
-			.fill( stockAmount );
-		await page.selectOption( '#variable_backorders0', 'notify', {
-			force: true,
-		} );
-		await firstVariationContainer
-			.getByPlaceholder( 'Store-wide threshold (2)' )
-			.fill( lowStockAmount );
-		await page.click( 'button.save-variation-changes' );
-		await page.click(
-			'#variable_product_options .toolbar-top a.expand_all'
-		);
-		await expect( page.locator( '#variable_stock0' ) ).toHaveValue(
-			stockAmount
-		);
-		await expect(
-			page.locator( '#variable_low_stock_amount0' )
-		).toHaveValue( lowStockAmount );
-		await expect(
-			page.locator( '#variable_backorders0 > option[selected]' )
-		).toHaveText( 'Allow, but notify customer' );
-
-		// set variation defaults
-		await page.click( 'a[href="#variable_product_options"]' );
-
-		// set variation defaults
-		for ( let i = 0; i < defaultAttributes.length; i++ ) {
-			await page.selectOption(
-				`select[name="default_attribute_attr-${ i + 1 }"]`,
-				defaultAttributes[ i ]
-			);
-		}
-		await page.click( 'button.save-variation-changes' );
-		await page.waitForSelector( 'input#variable_low_stock_amount0', {
-			state: 'hidden',
-		} );
-		for ( let i = 0; i < defaultAttributes.length; i++ ) {
-			await expect(
-				page.locator(
-					`select[name="default_attribute_attr-${ i + 1 }"]`
-				)
-			).toHaveValue( `${ defaultAttributes[ i ] }` );
-		}
-
-		// remove a variation
-		await page.click( 'a[href="#variable_product_options"]' );
-
-		// remove a variation
-		page.on( 'dialog', ( dialog ) => dialog.accept() );
-		await page.hover( '.woocommerce_variation' );
-		await page.click( '.remove_variation.delete' );
-		await expect( page.locator( '.woocommerce_variation' ) ).toHaveCount(
-			0
-		);
-	} );
-} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/page-loads.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/page-loads.spec.js
index 0093cf09ed8..76ba594c319 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/merchant/page-loads.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/page-loads.spec.js
@@ -1,6 +1,6 @@
 const { test, expect } = require( '@playwright/test' );
 
-// a represenation of the menu structure for WC
+// a representation of the menu structure for WC
 const wcPages = [
 	{
 		name: 'WooCommerce',
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-product-attributes.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-product-attributes.spec.js
new file mode 100644
index 00000000000..bcdef762f15
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-product-attributes.spec.js
@@ -0,0 +1,131 @@
+const { test, expect } = require( '@playwright/test' );
+const { variableProducts: utils } = require( '../../../../utils' );
+const {
+	createVariableProduct,
+	showVariableProductTour,
+	deleteProductsAddedByTests,
+	productAttributes,
+} = utils;
+
+let productId;
+
+test.describe( 'Add product attributes', () => {
+	test.use( { storageState: process.env.ADMINSTATE } );
+
+	test.beforeAll( async ( { browser } ) => {
+		productId = await createVariableProduct();
+
+		await showVariableProductTour( browser, false );
+	} );
+
+	test.afterAll( async () => {
+		await deleteProductsAddedByTests();
+	} );
+
+	test( 'can add custom product attributes', async ( { page } ) => {
+		await test.step(
+			`Open "Edit product" page of product id ${ productId }`,
+			async () => {
+				await page.goto(
+					`/wp-admin/post.php?post=${ productId }&action=edit`
+				);
+			}
+		);
+
+		await test.step( 'Go to the "Attributes" tab.', async () => {
+			const attributesTab = page
+				.locator( '.attribute_tab' )
+				.getByRole( 'link', { name: 'Attributes' } );
+
+			await attributesTab.click();
+		} );
+
+		await test.step(
+			`Add ${ productAttributes.length } attributes.`,
+			async () => {
+				for ( let i = 0; i < productAttributes.length; i++ ) {
+					const attributeName = productAttributes[ i ].name;
+					const attributeValues = productAttributes[ i ].options.join(
+						'|'
+					);
+
+					if ( i > 0 ) {
+						await test.step( "Click 'Add new'.", async () => {
+							await page
+								.locator( '#product_attributes .toolbar-top' )
+								.getByRole( 'button', { name: 'Add new' } )
+								.click();
+						} );
+					}
+
+					await test.step(
+						`Add the attribute "${ attributeName }" with values "${ attributeValues }"`,
+						async () => {
+							await test.step(
+								`Type "${ attributeName }" in the "Attribute name" input field.`,
+								async () => {
+									await page
+										.getByPlaceholder(
+											'f.e. size or color'
+										)
+										.nth( i )
+										.type( attributeName );
+								}
+							);
+
+							await test.step(
+								`Type the attribute values "${ attributeValues }".`,
+								async () => {
+									await page
+										.getByPlaceholder(
+											'Enter options for customers to choose from'
+										)
+										.nth( i )
+										.type( attributeValues );
+								}
+							);
+
+							await test.step(
+								'Click "Save attributes".',
+								async () => {
+									await page
+										.getByRole( 'button', {
+											name: 'Save attributes',
+										} )
+										.click( { clickCount: 3 } );
+								}
+							);
+
+							await test.step(
+								"Wait for the tour's dismissal to be saved",
+								async () => {
+									await page.waitForResponse(
+										( response ) =>
+											response
+												.url()
+												.includes( '/post.php' ) &&
+											response.status() === 200
+									);
+								}
+							);
+
+							await test.step(
+								`Expect the attribute "${ attributeName }" to be saved`,
+								async () => {
+									const savedAttributeHeading = page.getByRole(
+										'heading',
+										{ name: attributeName }
+									);
+
+									await expect(
+										savedAttributeHeading
+									).toBeVisible();
+								}
+							);
+						}
+					);
+				}
+			}
+		);
+	} );
+} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-variable-product.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-variable-product.spec.js
new file mode 100644
index 00000000000..64c8a7f8bbb
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-variable-product.spec.js
@@ -0,0 +1,123 @@
+const { test, expect } = require( '@playwright/test' );
+const { variableProducts: utils, api } = require( '../../../../utils' );
+const { showVariableProductTour } = utils;
+const productPageURL = 'wp-admin/post-new.php?post_type=product';
+const variableProductName = 'Variable Product with Three Variations';
+
+let productId;
+
+test.describe( 'Add variable product', () => {
+	test.use( { storageState: process.env.ADMINSTATE } );
+
+	test.beforeAll( async ( { browser } ) => {
+		await showVariableProductTour( browser, true );
+	} );
+
+	test.afterAll( async ( { browser } ) => {
+		await showVariableProductTour( browser, false );
+		await api.deletePost.product( productId );
+	} );
+
+	test( 'can create a variable product', async ( { page } ) => {
+		await test.step( 'Go to the "Add new product" page', async () => {
+			await page.goto( productPageURL );
+		} );
+
+		await test.step(
+			`Type "${ variableProductName }" into the "Product name" input field.`,
+			async () => {
+				const productNameTextbox = page.getByLabel( 'Product name' );
+				const permalink = page.locator( '#sample-permalink' );
+
+				await productNameTextbox.fill( variableProductName );
+				await productNameTextbox.blur();
+				await expect( permalink ).toBeVisible();
+			}
+		);
+
+		await test.step(
+			'Select the "Variable product" product type.',
+			async () => {
+				await page.selectOption( '#product-type', 'variable' );
+			}
+		);
+
+		await test.step(
+			'Scroll into the "Attributes" tab and click it.',
+			async () => {
+				const attributesTab = page
+					.locator( '.attribute_tab' )
+					.getByRole( 'link', { name: 'Attributes' } );
+
+				await attributesTab.scrollIntoViewIfNeeded();
+
+				await attributesTab.click();
+			}
+		);
+
+		// the tour only seems to display when not running headless, so just make sure
+		const tourWasDisplayed = await test.step(
+			'See if the tour was displayed.',
+			async () => {
+				return await page
+					.locator( '.woocommerce-tour-kit-step__heading' )
+					.isVisible();
+			}
+		);
+
+		if ( tourWasDisplayed ) {
+			await test.step( 'Tour was displayed, so dismiss it.', async () => {
+				await page
+					.getByRole( 'button', { name: 'Close Tour' } )
+					.click();
+			} );
+
+			await test.step(
+				"Wait for the tour's dismissal to be saved",
+				async () => {
+					await page.waitForResponse(
+						( response ) =>
+							response.url().includes( '/users/' ) &&
+							response.status() === 200
+					);
+				}
+			);
+		}
+
+		await test.step( `Expect the "Variations" tab to appear`, async () => {
+			const variationsTab = page.locator( 'li.variations_tab' );
+
+			await expect( variationsTab ).toBeVisible();
+		} );
+
+		await test.step( 'Save draft.', async () => {
+			await page.locator( '#save-post' ).click();
+		} );
+
+		await test.step(
+			'Expect the "Product draft updated." notice to appear.',
+			async () => {
+				await expect(
+					page.getByText( 'Product draft updated.' )
+				).toBeVisible();
+			}
+		);
+
+		await test.step(
+			'Expect the product type to be "Variable product"',
+			async () => {
+				const selectedProductType = page.locator(
+					'select#product-type [selected]'
+				);
+
+				await expect( selectedProductType ).toHaveText(
+					'Variable product'
+				);
+			}
+		);
+
+		await test.step( 'Save product ID for clean up.', async () => {
+			productId = page.url().match( /(?<=post=)\d+/ );
+		} );
+	} );
+} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-variations.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-variations.spec.js
new file mode 100644
index 00000000000..bb4c5d72316
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/create-variations.spec.js
@@ -0,0 +1,194 @@
+const { test, expect } = require( '@playwright/test' );
+const { variableProducts: utils } = require( '../../../../utils' );
+const {
+	createVariableProduct,
+	showVariableProductTour,
+	deleteProductsAddedByTests,
+	generateVariationsFromAttributes,
+	productAttributes,
+} = utils;
+
+let expectedGeneratedVariations,
+	productId_addManually,
+	productId_generateVariations,
+	variationsToManuallyCreate;
+
+test.describe( 'Add variations', () => {
+	test.use( { storageState: process.env.ADMINSTATE } );
+
+	test.beforeAll( async ( { browser } ) => {
+		productId_generateVariations = await createVariableProduct(
+			productAttributes
+		);
+
+		productId_addManually = await createVariableProduct(
+			productAttributes
+		);
+
+		expectedGeneratedVariations = generateVariationsFromAttributes(
+			productAttributes
+		);
+
+		variationsToManuallyCreate = expectedGeneratedVariations.slice( 0, 3 );
+
+		await showVariableProductTour( browser, false );
+	} );
+
+	test.afterAll( async () => {
+		await deleteProductsAddedByTests();
+	} );
+
+	test( 'can generate variations from product attributes', async ( {
+		page,
+	} ) => {
+		await test.step(
+			`Open "Edit product" page of product id ${ productId_generateVariations }`,
+			async () => {
+				await page.goto(
+					`/wp-admin/post.php?post=${ productId_generateVariations }&action=edit`
+				);
+			}
+		);
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.click( 'a[href="#variable_product_options"]' );
+		} );
+
+		await test.step(
+			'Click on the "Generate variations" button.',
+			async () => {
+				// event listener for handling the link_all_variations confirmation dialog
+				page.on( 'dialog', ( dialog ) => dialog.accept() );
+
+				await page.click( 'button.generate_variations' );
+			}
+		);
+
+		await test.step(
+			`Expect the number of variations to be ${ expectedGeneratedVariations.length }`,
+			async () => {
+				const variations = page.locator( '.woocommerce_variation' );
+
+				await expect( variations ).toHaveCount(
+					expectedGeneratedVariations.length
+				);
+			}
+		);
+
+		for ( const variation of expectedGeneratedVariations ) {
+			await test.step(
+				`Expect the variation "${ variation.join(
+					', '
+				) }" to be generated.`,
+				async () => {
+					let variationRow = page.locator(
+						'.woocommerce_variation h3'
+					);
+
+					for ( const attributeValue of variation ) {
+						variationRow = variationRow.filter( {
+							has: page.locator( 'option[selected]', {
+								hasText: attributeValue,
+							} ),
+						} );
+					}
+
+					await expect( variationRow ).toBeVisible();
+				}
+			);
+		}
+	} );
+
+	test( 'can manually add a variation', async ( { page } ) => {
+		await test.step(
+			`Open "Edit product" page of product id ${ productId_addManually }`,
+			async () => {
+				await page.goto(
+					`/wp-admin/post.php?post=${ productId_addManually }&action=edit`
+				);
+			}
+		);
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.click( 'a[href="#variable_product_options"]' );
+		} );
+
+		await test.step(
+			`Manually add ${ variationsToManuallyCreate.length } variations`,
+			async () => {
+				const variationRows = page.locator(
+					'.woocommerce_variation h3'
+				);
+				let variationRowsCount = await variationRows.count();
+
+				for ( const variationToCreate of variationsToManuallyCreate ) {
+					await test.step( 'Click "Add manually"', async () => {
+						const addManuallyButton = page.getByRole( 'button', {
+							name: 'Add manually',
+						} );
+
+						await addManuallyButton.click();
+
+						await expect( variationRows ).toHaveCount(
+							++variationRowsCount
+						);
+					} );
+
+					for ( const attributeValue of variationToCreate ) {
+						const attributeName = productAttributes.find(
+							( { options } ) =>
+								options.includes( attributeValue )
+						).name;
+						const addAttributeMenu = variationRows
+							.nth( 0 )
+							.locator( 'select', {
+								has: page.locator( 'option', {
+									hasText: attributeValue,
+								} ),
+							} );
+
+						await test.step(
+							`Select "${ attributeValue }" from the "${ attributeName }" attribute menu`,
+							async () => {
+								await addAttributeMenu.selectOption(
+									attributeValue
+								);
+							}
+						);
+					}
+
+					await test.step( 'Click "Save changes"', async () => {
+						await page
+							.getByRole( 'button', {
+								name: 'Save changes',
+							} )
+							.click();
+					} );
+
+					await test.step(
+						`Expect the variation ${ variationToCreate.join(
+							', '
+						) } to be successfully saved.`,
+						async () => {
+							let newlyAddedVariationRow;
+
+							for ( const attributeValue of variationToCreate ) {
+								newlyAddedVariationRow = (
+									newlyAddedVariationRow || variationRows
+								).filter( {
+									has: page.locator( 'option[selected]', {
+										hasText: attributeValue,
+									} ),
+								} );
+							}
+
+							await expect(
+								newlyAddedVariationRow
+							).toBeVisible();
+						}
+					);
+				}
+			}
+		);
+	} );
+} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/update-variations.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/update-variations.spec.js
new file mode 100644
index 00000000000..528796ce9b9
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/products/add-variable-product/update-variations.spec.js
@@ -0,0 +1,616 @@
+const { test, expect } = require( '@playwright/test' );
+const { variableProducts: utils } = require( '../../../../utils' );
+const {
+	createVariableProduct,
+	showVariableProductTour,
+	deleteProductsAddedByTests,
+	productAttributes,
+	sampleVariations,
+	createVariations,
+} = utils;
+const variationOnePrice = '9.99';
+const variationTwoPrice = '11.99';
+const variationThreePrice = '20.00';
+const productWeight = '200';
+const productLength = '10';
+const productWidth = '20';
+const productHeight = '15';
+const stockAmount = '100';
+const lowStockAmount = '10';
+
+let productId_indivEdit,
+	productId_bulkEdit,
+	productId_deleteAll,
+	productId_manageStock,
+	productId_variationDefaults,
+	productId_removeVariation,
+	defaultVariation,
+	variationIds_indivEdit;
+
+test.describe( 'Update variations', () => {
+	test.use( { storageState: process.env.ADMINSTATE } );
+
+	test.beforeAll( async ( { browser } ) => {
+		await test.step(
+			'Create variable product for individual edit test',
+			async () => {
+				productId_indivEdit = await createVariableProduct(
+					productAttributes
+				);
+
+				variationIds_indivEdit = await createVariations(
+					productId_indivEdit,
+					sampleVariations
+				);
+			}
+		);
+
+		await test.step(
+			'Create variable product for bulk edit test',
+			async () => {
+				productId_bulkEdit = await createVariableProduct(
+					productAttributes
+				);
+
+				await createVariations( productId_bulkEdit, sampleVariations );
+			}
+		);
+
+		await test.step(
+			'Create variable product for "delete all" test',
+			async () => {
+				productId_deleteAll = await createVariableProduct(
+					productAttributes
+				);
+
+				await createVariations( productId_deleteAll, sampleVariations );
+			}
+		);
+
+		await test.step(
+			'Create variable product for "manage stock" test',
+			async () => {
+				productId_manageStock = await createVariableProduct(
+					productAttributes
+				);
+
+				const variation = sampleVariations.slice( -1 );
+
+				await createVariations( productId_manageStock, variation );
+			}
+		);
+
+		await test.step(
+			'Create variable product for "variation defaults" test',
+			async () => {
+				productId_variationDefaults = await createVariableProduct(
+					productAttributes
+				);
+
+				await createVariations(
+					productId_variationDefaults,
+					sampleVariations
+				);
+
+				defaultVariation = sampleVariations[ 1 ].attributes;
+			}
+		);
+
+		await test.step(
+			'Create variable product with 1 variation for "remove variation" test',
+			async () => {
+				productId_removeVariation = await createVariableProduct(
+					productAttributes
+				);
+
+				await createVariations(
+					productId_removeVariation,
+					sampleVariations.slice( -1 )
+				);
+			}
+		);
+
+		await test.step( 'Hide variable product tour', async () => {
+			await showVariableProductTour( browser, false );
+		} );
+	} );
+
+	test.afterAll( async () => {
+		await deleteProductsAddedByTests();
+	} );
+
+	test( 'can individually edit variations', async ( { page } ) => {
+		const variationRows = page.locator( '.woocommerce_variation' );
+		const firstVariation = variationRows.filter( {
+			hasText: `#${ variationIds_indivEdit[ 0 ] }`,
+		} );
+		const secondVariation = variationRows.filter( {
+			hasText: `#${ variationIds_indivEdit[ 1 ] }`,
+		} );
+		const thirdVariation = variationRows.filter( {
+			hasText: `#${ variationIds_indivEdit[ 2 ] }`,
+		} );
+
+		await test.step( 'Go to the "Edit product" page.', async () => {
+			await page.goto(
+				`/wp-admin/post.php?post=${ productId_indivEdit }&action=edit`
+			);
+		} );
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.locator( 'a[href="#variable_product_options"]' ).click();
+		} );
+
+		await test.step( 'Expand all variations.', async () => {
+			await page
+				.locator(
+					'#variable_product_options .toolbar-top a.expand_all'
+				)
+				.click();
+		} );
+
+		await test.step( 'Edit the first variation.', async () => {
+			await test.step( 'Check the "Virtual" checkbox.', async () => {
+				await firstVariation
+					.getByRole( 'checkbox', {
+						name: 'Virtual',
+					} )
+					.check();
+			} );
+
+			await test.step(
+				`Set regular price to "${ variationOnePrice }".`,
+				async () => {
+					await firstVariation
+						.getByRole( 'textbox', { name: 'Regular price' } )
+						.fill( variationOnePrice );
+				}
+			);
+		} );
+
+		await test.step( 'Edit the second variation.', async () => {
+			await test.step( 'Check the "Virtual" checkbox.', async () => {
+				await secondVariation
+					.getByRole( 'checkbox', {
+						name: 'Virtual',
+					} )
+					.check();
+			} );
+
+			await test.step(
+				`Set regular price to "${ variationTwoPrice }".`,
+				async () => {
+					await secondVariation
+						.getByRole( 'textbox', { name: 'Regular price' } )
+						.fill( variationTwoPrice );
+				}
+			);
+		} );
+
+		await test.step( 'Edit the third variation.', async () => {
+			await test.step( 'Check "Manage stock?"', async () => {
+				await thirdVariation
+					.getByRole( 'checkbox', { name: 'Manage stock?' } )
+					.check();
+			} );
+
+			await test.step(
+				`Set regular price to "${ variationThreePrice }".`,
+				async () => {
+					await thirdVariation
+						.getByRole( 'textbox', { name: 'Regular price' } )
+						.fill( variationThreePrice );
+				}
+			);
+
+			await test.step( 'Set the weight and dimensions.', async () => {
+				await thirdVariation
+					.getByRole( 'textbox', { name: 'Weight' } )
+					.type( productWeight );
+
+				await thirdVariation
+					.getByRole( 'textbox', { name: 'Length' } )
+					.type( productLength );
+
+				await thirdVariation
+					.getByRole( 'textbox', { name: 'Width' } )
+					.type( productWidth );
+
+				await thirdVariation
+					.getByRole( 'textbox', { name: 'Height' } )
+					.type( productHeight );
+			} );
+		} );
+
+		await test.step( 'Click "Save changes".', async () => {
+			const saveButton = page.getByRole( 'button', {
+				name: 'Save changes',
+			} );
+			await saveButton.click();
+			await expect( saveButton ).toBeDisabled();
+		} );
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.locator( 'a[href="#variable_product_options"]' ).click();
+		} );
+
+		await test.step( 'Expand all variations.', async () => {
+			await page
+				.locator(
+					'#variable_product_options .toolbar-top a.expand_all'
+				)
+				.click();
+		} );
+
+		await test.step(
+			'Expect the first variation to be virtual.',
+			async () => {
+				await expect(
+					firstVariation.getByRole( 'checkbox', {
+						name: 'Virtual',
+					} )
+				).toBeChecked();
+			}
+		);
+
+		await test.step(
+			`Expect the regular price of the first variation to be "${ variationOnePrice }".`,
+			async () => {
+				await expect(
+					firstVariation.getByRole( 'textbox', {
+						name: 'Regular price',
+					} )
+				).toHaveValue( variationOnePrice );
+			}
+		);
+
+		await test.step(
+			'Expect the second variation to be virtual.',
+			async () => {
+				await expect(
+					secondVariation.getByRole( 'checkbox', {
+						name: 'Virtual',
+					} )
+				).toBeChecked();
+			}
+		);
+
+		await test.step(
+			`Expect the regular price of the second variation to be "${ variationTwoPrice }".`,
+			async () => {
+				await expect(
+					secondVariation.getByRole( 'textbox', {
+						name: 'Regular price',
+					} )
+				).toHaveValue( variationTwoPrice );
+			}
+		);
+
+		await test.step(
+			'Expect the "Manage stock?" checkbox of the third variation to be checked.',
+			async () => {
+				await expect(
+					thirdVariation.getByRole( 'checkbox', {
+						name: 'Manage stock?',
+					} )
+				).toBeChecked();
+			}
+		);
+
+		await test.step(
+			`Expect the regular price of the third variation to be "${ variationThreePrice }".`,
+			async () => {
+				await expect(
+					thirdVariation.getByRole( 'textbox', {
+						name: 'Regular price',
+					} )
+				).toHaveValue( variationThreePrice );
+			}
+		);
+
+		await test.step(
+			'Expect the weight and dimensions of the third variation to be correct.',
+			async () => {
+				await expect(
+					thirdVariation.getByRole( 'textbox', {
+						name: 'Weight',
+					} )
+				).toHaveValue( productWeight );
+
+				await expect(
+					thirdVariation.getByRole( 'textbox', {
+						name: 'Length',
+					} )
+				).toHaveValue( productLength );
+
+				await expect(
+					thirdVariation.getByRole( 'textbox', { name: 'Width' } )
+				).toHaveValue( productWidth );
+
+				await expect(
+					thirdVariation.getByRole( 'textbox', {
+						name: 'Height',
+					} )
+				).toHaveValue( productHeight );
+			}
+		);
+	} );
+
+	test( 'can bulk edit variations', async ( { page } ) => {
+		await test.step( 'Go to the "Edit product" page.', async () => {
+			await page.goto(
+				`/wp-admin/post.php?post=${ productId_bulkEdit }&action=edit`
+			);
+		} );
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.locator( 'a[href="#variable_product_options"]' ).click();
+		} );
+
+		await test.step(
+			'Select the \'Toggle "Downloadable"\' bulk action.',
+			async () => {
+				await page
+					.locator( '#field_to_edit' )
+					.selectOption( 'toggle_downloadable' );
+			}
+		);
+
+		await test.step( 'Expand all variations.', async () => {
+			await page
+				.locator(
+					'#variable_product_options .toolbar-top a.expand_all'
+				)
+				.click();
+		} );
+
+		await test.step(
+			'Expect all "Downloadable" checkboxes to be checked.',
+			async () => {
+				const checkBoxes = page.locator(
+					'input[name^="variable_is_downloadable"]'
+				);
+				const count = await checkBoxes.count();
+
+				for ( let i = 0; i < count; i++ ) {
+					await expect( checkBoxes.nth( i ) ).toBeChecked();
+				}
+			}
+		);
+	} );
+
+	test( 'can delete all variations', async ( { page } ) => {
+		await test.step( 'Go to the "Edit product" page.', async () => {
+			await page.goto(
+				`/wp-admin/post.php?post=${ productId_deleteAll }&action=edit`
+			);
+		} );
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.locator( 'a[href="#variable_product_options"]' ).click();
+		} );
+
+		await test.step(
+			'Select the bulk action "Delete all variations".',
+			async () => {
+				page.on( 'dialog', ( dialog ) => dialog.accept() );
+				await page
+					.locator( '#field_to_edit' )
+					.selectOption( 'delete_all' );
+			}
+		);
+
+		await test.step(
+			'Expect that there are no more variations.',
+			async () => {
+				await expect(
+					page.locator( '.woocommerce_variation' )
+				).toHaveCount( 0 );
+			}
+		);
+	} );
+
+	test( 'can manage stock levels', async ( { page } ) => {
+		await test.step( 'Go to the "Edit product" page.', async () => {
+			await page.goto(
+				`/wp-admin/post.php?post=${ productId_manageStock }&action=edit`
+			);
+		} );
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.locator( 'a[href="#variable_product_options"]' ).click();
+		} );
+
+		await test.step( 'Expand all variations', async () => {
+			await page
+				.locator(
+					'#variable_product_options .toolbar-top a.expand_all'
+				)
+				.click();
+		} );
+
+		const variationContainer = page.locator(
+			'.woocommerce_variations .woocommerce_variation'
+		);
+
+		await test.step( 'Check the "Manage stock?" box', async () => {
+			await variationContainer
+				.locator( 'input.checkbox.variable_manage_stock' )
+				.check();
+		} );
+
+		await test.step(
+			`Expect the "Stock status" text box to disappear`,
+			async () => {
+				await expect(
+					variationContainer.locator( 'p.variable_stock_status' )
+				).not.toBeVisible();
+			}
+		);
+
+		await test.step(
+			`Enter "${ variationOnePrice }" as the regular price`,
+			async () => {
+				await variationContainer
+					.getByPlaceholder( 'Variation price (required)' )
+					.fill( variationOnePrice );
+			}
+		);
+
+		await test.step(
+			`Enter "${ stockAmount }" as the stock quantity`,
+			async () => {
+				await variationContainer
+					.locator( 'input[name^="variable_stock"]' )
+					.fill( stockAmount );
+			}
+		);
+
+		await test.step(
+			'Select "Allow, but notify customer" from the "Allow backorders?" menu',
+			async () => {
+				await variationContainer
+					.locator( 'select[name^="variable_backorders"]' )
+					.selectOption( 'notify' );
+			}
+		);
+
+		await test.step(
+			`Enter "${ lowStockAmount }" in the "Low stock threshold" input field.`,
+			async () => {
+				await variationContainer
+					.getByPlaceholder( 'Store-wide threshold' )
+					.fill( lowStockAmount );
+			}
+		);
+
+		await test.step( 'Click "Save changes"', async () => {
+			await page.locator( 'button.save-variation-changes' ).click();
+		} );
+
+		await test.step( 'Expand all variations', async () => {
+			await page
+				.locator(
+					'#variable_product_options .toolbar-top a.expand_all'
+				)
+				.click();
+		} );
+
+		await test.step(
+			'Expect the stock quantity to be saved correctly',
+			async () => {
+				await expect(
+					variationContainer.locator(
+						'input[name^="variable_stock"]'
+					)
+				).toHaveValue( stockAmount );
+			}
+		);
+
+		await test.step(
+			'Expect the "Low stock threshold" value to be saved correctly',
+			async () => {
+				await expect(
+					variationContainer.getByPlaceholder(
+						'Store-wide threshold'
+					)
+				).toHaveValue( lowStockAmount );
+			}
+		);
+
+		await test.step(
+			'Expect the "Allow backorders?" value to be saved correctly',
+			async () => {
+				await expect(
+					variationContainer.locator(
+						'select[name^="variable_backorders"] > option[selected]'
+					)
+				).toHaveText( 'Allow, but notify customer' );
+			}
+		);
+	} );
+
+	test( 'can set variation defaults', async ( { page } ) => {
+		await test.step( 'Go to the "Edit product" page.', async () => {
+			await page.goto(
+				`/wp-admin/post.php?post=${ productId_variationDefaults }&action=edit`
+			);
+		} );
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.locator( 'a[href="#variable_product_options"]' ).click();
+		} );
+
+		await test.step( 'Select variation defaults', async () => {
+			for ( const attribute of defaultVariation ) {
+				const defaultAttributeMenu = page.locator( 'select', {
+					hasText: `No default ${ attribute.name }…`,
+				} );
+
+				await defaultAttributeMenu.selectOption( attribute.option );
+			}
+		} );
+
+		await test.step( 'Click "Save changes"', async () => {
+			const saveButton = page.getByRole( 'button', {
+				name: 'Save changes',
+			} );
+			await saveButton.click();
+			await expect( saveButton ).toBeDisabled();
+		} );
+
+		await test.step( 'View the product from the shop', async () => {
+			const permalink = await page
+				.locator( '#sample-permalink a' )
+				.getAttribute( 'href' );
+
+			await page.goto( permalink );
+		} );
+
+		await test.step(
+			'Expect the default attributes to be pre-selected',
+			async () => {
+				for ( const attribute of defaultVariation ) {
+					await test.step(
+						`Expect "${ attribute.option }" is selected as the default "${ attribute.name }"`,
+						async () => {
+							const defaultSelectedAttribute = page
+								.getByRole( 'row', {
+									name: attribute.name,
+								} )
+								.locator( 'option[selected]' );
+
+							await expect( defaultSelectedAttribute ).toHaveText(
+								attribute.option
+							);
+						}
+					);
+				}
+			}
+		);
+	} );
+
+	test( 'can remove a variation', async ( { page } ) => {
+		await test.step( 'Go to the "Edit product" page.', async () => {
+			await page.goto(
+				`/wp-admin/post.php?post=${ productId_removeVariation }&action=edit`
+			);
+		} );
+
+		await test.step( 'Click on the "Variations" tab.', async () => {
+			await page.locator( 'a[href="#variable_product_options"]' ).click();
+		} );
+
+		await test.step( 'Click "Remove" on a variation', async () => {
+			page.on( 'dialog', ( dialog ) => dialog.accept() );
+			await page.locator( '.woocommerce_variation' ).hover();
+			await page.locator( '.remove_variation.delete' ).click();
+		} );
+
+		await test.step( 'Expect the variation to be removed', async () => {
+			await expect(
+				page.locator( '.woocommerce_variation' )
+			).toHaveCount( 0 );
+		} );
+	} );
+} );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shopper/checkout-create-account.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/shopper/checkout-create-account.spec.js
index 856f528a112..69f6c765faf 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/shopper/checkout-create-account.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/shopper/checkout-create-account.spec.js
@@ -169,7 +169,7 @@ test.describe( 'Shopper Checkout Create Account', () => {
 		await expect( page.locator( 'h1.entry-title' ) ).toContainText(
 			'My account'
 		);
-		await page.click( 'text=Logout' );
+		await page.click( 'text=Log out' );
 		// sign in as admin to confirm account creation
 		await page.fill( '#username', admin.username );
 		await page.fill( '#password', admin.password );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account-create-account.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account-create-account.spec.js
index 8364bd746bc..0da54a72912 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account-create-account.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account-create-account.spec.js
@@ -78,7 +78,7 @@ test.describe( 'Shopper My Account Create Account', () => {
 		await expect( page.locator( 'h1.entry-title' ) ).toContainText(
 			'My account'
 		);
-		await expect( page.locator( 'text=Logout' ) ).toBeVisible();
+		await expect( page.locator( 'text=Log out' ).first() ).toBeVisible();
 
 		await page.goto( 'my-account/edit-account/' );
 		await expect( page.locator( '#account_email' ) ).toHaveValue(
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account.spec.js
index 85598a8287f..611b771300a 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account.spec.js
@@ -45,7 +45,7 @@ test.describe( 'My account page', () => {
 			page.locator(
 				'.woocommerce-MyAccount-navigation-link--customer-logout'
 			)
-		).toContainText( 'Logout' );
+		).toContainText( 'Log out' );
 	} );
 
 	for ( let i = 0; i < pages.length; i++ ) {
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shopper/order-email-receiving.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/shopper/order-email-receiving.spec.js
index a0f7570b32e..7dc9a7c9fff 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/shopper/order-email-receiving.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/shopper/order-email-receiving.spec.js
@@ -7,7 +7,7 @@ let productId, orderId;
 const product = {
 	name: 'Order email product',
 	type: 'simple',
-	price: '42.77',
+	regular_price: '42.77',
 };
 
 const storeName = 'WooCommerce Core E2E Test Suite';
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/shopper/variable-product-updates.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/shopper/variable-product-updates.spec.js
index 9f31e198b8b..869d563228b 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/shopper/variable-product-updates.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/shopper/variable-product-updates.spec.js
@@ -174,7 +174,7 @@ test.describe( 'Shopper > Update variable product', () => {
 		).toContainText( productPrice );
 	} );
 
-	test( 'Shopper can change attributes to combination with dimentions and weight', async ( {
+	test( 'Shopper can change attributes to combination with dimensions and weight', async ( {
 		page,
 	} ) => {
 		await page.goto( `product/${ slug }` );
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/smoke-tests/upload-plugin.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/smoke-tests/upload-plugin.spec.js
index 10506db7c46..d094dcce0c6 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/smoke-tests/upload-plugin.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/smoke-tests/upload-plugin.spec.js
@@ -15,9 +15,17 @@ const {
 } = require( '../../utils/plugin-utils' );
 
 const skipMessage = 'Skipping this test because PLUGIN_REPOSITORY is undefined';
+const deletePluginFromSite = async ( { request, baseURL } ) => {
+	await deletePlugin( {
+		request,
+		baseURL,
+		slug: pluginSlug,
+		username: admin.username,
+		password: admin.password,
+	} );
+};
 
-let pluginPath;
-let pluginSlug;
+let pluginSlug, pluginPath;
 
 test.skip( () => {
 	const shouldSkip = ! PLUGIN_REPOSITORY;
@@ -35,42 +43,86 @@ test.describe( `${ PLUGIN_NAME } plugin can be uploaded and activated`, () => {
 	test.beforeAll( async ( { playwright, baseURL } ) => {
 		pluginSlug = path.basename( PLUGIN_REPOSITORY );
 
-		// Download plugin.
-		pluginPath = await downloadZip( {
-			repository: PLUGIN_REPOSITORY,
-			authorizationToken: GITHUB_TOKEN,
-		} );
+		pluginPath = await test.step(
+			`Download ${ PLUGIN_NAME } plugin zip`,
+			async () => {
+				return downloadZip( {
+					repository: PLUGIN_REPOSITORY,
+					authorizationToken: GITHUB_TOKEN,
+				} );
+			}
+		);
 
-		// Delete plugin from test site if it's installed.
-		await deletePlugin( {
-			request: playwright.request,
-			baseURL,
-			slug: pluginSlug,
-			username: admin.username,
-			password: admin.password,
+		await test.step(
+			"Delete plugin from test site if it's installed.",
+			async () => {
+				await deletePluginFromSite( {
+					request: playwright.request,
+					baseURL,
+				} );
+			}
+		);
+	} );
+
+	test.afterAll( async ( { playwright, baseURL } ) => {
+		await test.step(
+			"Delete plugin from test site if it's installed.",
+			async () => {
+				await deletePluginFromSite( {
+					request: playwright.request,
+					baseURL,
+				} );
+			}
+		);
+
+		await test.step( 'Delete the downloaded zip', async () => {
+			await deleteZip( pluginPath );
 		} );
 	} );
 
-	test.afterAll( async ( {} ) => {
-		// Delete the downloaded zip.
-		await deleteZip( pluginPath );
-	} );
+	test( `can upload and activate "${ PLUGIN_NAME }"`, async ( { page } ) => {
+		await test.step(
+			`Install "${ PLUGIN_NAME }" through WP CLI`,
+			async () => {
+				await installPluginThruWpCli( pluginPath );
+			}
+		);
 
-	test( `can upload and activate ${ PLUGIN_NAME }`, async ( { page } ) => {
-		await installPluginThruWpCli( pluginPath );
+		await test.step( 'Go to the "Installed Plugins" page', async () => {
+			await page.goto( 'wp-admin/plugins.php' );
+		} );
 
-		// Go to 'Installed plugins' page.
-		// Repeat in case the newly installed plugin redirects to their own onboarding screen upon first install, like what Yoast SEO does.
-		let reload = 2;
-		do {
-			await page.goto( 'wp-admin/plugins.php', {
-				waitUntil: 'networkidle',
+		await test.step(
+			`Expect "${ PLUGIN_NAME }" to be listed and active.`,
+			async () => {
+				await expect(
+					page.locator( `#deactivate-${ pluginSlug }` )
+				).toBeVisible();
+			}
+		);
+
+		await test.step( 'Expect the shop to load successfully.', async () => {
+			const shopHeading = page.getByRole( 'heading', {
+				name: 'Shop',
 			} );
-		} while ( ! page.url().includes( '/plugins.php' ) && --reload );
 
-		// Assert that the plugin is listed and active
-		await expect(
-			page.locator( `#deactivate-${ pluginSlug }` )
-		).toBeVisible();
+			await page.goto( '/shop' );
+			await expect( shopHeading ).toBeVisible();
+		} );
+
+		await test.step(
+			'Expect the WooCommerce Homepage to load successfully.',
+			async () => {
+				const statsOverviewHeading = page.getByText( 'Stats overview' );
+				const skipSetupStoreLink = page.getByRole( 'button', {
+					name: 'Skip setup store details',
+				} );
+
+				await page.goto( '/wp-admin/admin.php?page=wc-admin' );
+				await expect(
+					statsOverviewHeading.or( skipSetupStoreLink )
+				).toBeVisible();
+			}
+		);
 	} );
 } );
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/api.js b/plugins/woocommerce/tests/e2e-pw/utils/api.js
index 193e5a40e18..8d1e0781ff9 100644
--- a/plugins/woocommerce/tests/e2e-pw/utils/api.js
+++ b/plugins/woocommerce/tests/e2e-pw/utils/api.js
@@ -1,4 +1,5 @@
 const wcApi = require( '@woocommerce/woocommerce-rest-api' ).default;
+const { async } = require( 'regenerator-runtime' );
 const config = require( '../playwright.config' );
 
 let api;
@@ -243,14 +244,28 @@ const get = {
 
 const create = {
 	product: async ( product ) => {
-		const response = await api.post( 'products', {
-			name: product.name,
-			type: product.type,
-			regular_price: product.price,
-		} );
+		const response = await api.post( 'products', product );
 
 		return response.data.id;
 	},
+	/**
+	 * Batch create product variations.
+	 *
+	 * @see {@link [Batch update product variations](https://woocommerce.github.io/woocommerce-rest-api-docs/#batch-update-product-variations)}
+	 * @param {number|string} productId Product ID to add variations to
+	 * @param {object[]} variations Array of variations to add. See [Product variation properties](https://woocommerce.github.io/woocommerce-rest-api-docs/#product-variation-properties)
+	 * @returns {Promise<number[]>} Array of variation ID's.
+	 */
+	productVariations: async ( productId, variations ) => {
+		const response = await api.post(
+			`products/${ productId }/variations/batch`,
+			{
+				create: variations,
+			}
+		);
+
+		return response.data.create.map( ( { id } ) => id );
+	},
 };
 
 const deletePost = {
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/index.js b/plugins/woocommerce/tests/e2e-pw/utils/index.js
index faf3ec4e3c3..9baaf51b491 100644
--- a/plugins/woocommerce/tests/e2e-pw/utils/index.js
+++ b/plugins/woocommerce/tests/e2e-pw/utils/index.js
@@ -1,9 +1,11 @@
 const onboarding = require( './onboarding' );
 const api = require( './api' );
 const site = require( './site' );
+const variableProducts = require( './variable-products' );
 
 module.exports = {
 	onboarding,
 	api,
 	site,
+	variableProducts,
 };
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/plugin-utils.js b/plugins/woocommerce/tests/e2e-pw/utils/plugin-utils.js
index 5243e496aad..c06f3180e67 100644
--- a/plugins/woocommerce/tests/e2e-pw/utils/plugin-utils.js
+++ b/plugins/woocommerce/tests/e2e-pw/utils/plugin-utils.js
@@ -38,6 +38,7 @@ export const deletePlugin = async ( {
 		baseURL,
 		extraHTTPHeaders: {
 			Authorization: `Basic ${ encodeCredentials( username, password ) }`,
+			cookie: '',
 		},
 	} );
 	const listPluginsResponse = await apiContext.get(
@@ -55,37 +56,12 @@ export const deletePlugin = async ( {
 	if ( pluginToDelete ) {
 		const { plugin } = pluginToDelete;
 		const requestURL = `/wp-json/wp/v2/plugins/${ plugin }`;
-		let response;
 
-		// Some plugins do not respond to some of the WP REST API endpoints like Contact Form 7.
-		// Print warning in such cases.
-		const warn = async ( response, warningMsg ) => {
-			console.warn( warningMsg );
-			console.warn(
-				`Response status: ${ response.status() } ${ response.statusText() }`
-			);
-			console.warn( `Response body:` );
-			console.warn( await response.json() );
-			console.warn( '\n' );
-		};
-
-		response = await apiContext.put( requestURL, {
+		await apiContext.put( requestURL, {
 			data: { status: 'inactive' },
 		} );
-		if ( ! response.ok() ) {
-			await warn(
-				response,
-				`WARNING: Failed to deactivate plugin ${ plugin }`
-			);
-		}
 
-		response = await apiContext.delete( requestURL );
-		if ( ! response.ok() ) {
-			await warn(
-				response,
-				`WARNING: Failed to delete plugin ${ plugin }`
-			);
-		}
+		await apiContext.delete( requestURL );
 	}
 };
 
@@ -164,10 +140,8 @@ export const downloadZip = async ( {
  * @param {string} zipFilePath Local file path to the ZIP.
  */
 export const deleteZip = async ( zipFilePath ) => {
-	console.log( `Deleting file located in ${ zipFilePath }...` );
 	await fs.unlink( zipFilePath, ( err ) => {
 		if ( err ) throw err;
-		console.log( `Successfully deleted!` );
 	} );
 };
 
diff --git a/plugins/woocommerce/tests/e2e-pw/utils/variable-products.js b/plugins/woocommerce/tests/e2e-pw/utils/variable-products.js
new file mode 100644
index 00000000000..3a71d7dc44d
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/utils/variable-products.js
@@ -0,0 +1,226 @@
+const api = require( './api' );
+
+/**
+ * Array to hold all product ID's to be deleted after test.
+ */
+const productIds = [];
+
+/**
+ * The `attributes` property to be used in the request payload for creating a variable product through the REST API.
+ *
+ * @see {@link [Product - Attributes properties](https://woocommerce.github.io/woocommerce-rest-api-docs/#product-attributes-properties)}
+ */
+const productAttributes = [
+	{
+		name: 'Colour',
+		visible: true,
+		variation: true,
+		options: [ 'Red', 'Green' ],
+	},
+	{
+		name: 'Size',
+		visible: true,
+		variation: true,
+		options: [ 'Small', 'Medium' ],
+	},
+	{
+		name: 'Logo',
+		visible: true,
+		variation: true,
+		options: [ 'Woo', 'WordPress' ],
+	},
+];
+
+/**
+ * Request payload for creating variations.
+ *
+ * @see {@link [Product variation properties](https://woocommerce.github.io/woocommerce-rest-api-docs/#product-variation-properties)}
+ */
+const sampleVariations = [
+	{
+		regular_price: '9.99',
+		attributes: [
+			{
+				name: 'Colour',
+				option: 'Red',
+			},
+			{
+				name: 'Size',
+				option: 'Small',
+			},
+			{
+				name: 'Logo',
+				option: 'Woo',
+			},
+		],
+	},
+	{
+		regular_price: '10.99',
+		attributes: [
+			{
+				name: 'Colour',
+				option: 'Red',
+			},
+			{
+				name: 'Size',
+				option: 'Small',
+			},
+			{
+				name: 'Logo',
+				option: 'WordPress',
+			},
+		],
+	},
+	{
+		regular_price: '11.99',
+		attributes: [
+			{
+				name: 'Colour',
+				option: 'Red',
+			},
+			{
+				name: 'Size',
+				option: 'Medium',
+			},
+			{
+				name: 'Logo',
+				option: 'Woo',
+			},
+		],
+	},
+];
+
+/**
+ * Create a variable product using the WooCommerce REST API.
+ *
+ * @param {{ name: string, visible: boolean, variation: boolean, options: string[] }[]} attributes List of attributes. See [Product - Attributes properties](https://woocommerce.github.io/woocommerce-rest-api-docs/#product-attributes-properties).
+ * @returns {Promise<number>} ID of the created variable product
+ */
+async function createVariableProduct( attributes = [] ) {
+	const randomNum = Math.floor( Math.random() * 1000 );
+	const payload = {
+		name: `Unbranded Granite Shirt ${ randomNum }`,
+		type: 'variable',
+		attributes,
+	};
+
+	const productId = await api.create.product( payload );
+
+	productIds.push( productId );
+
+	return productId;
+}
+
+/**
+ * Clean up all products created by the test.
+ */
+async function deleteProductsAddedByTests() {
+	await api.deletePost.products( productIds );
+}
+
+/**
+ * Enable or disable the variable product tour through JavaScript.
+ *
+ * @param {import('@playwright/test').Browser} browser
+ * @param {boolean} show Whether to show the variable product tour or not.
+ */
+async function showVariableProductTour( browser, show ) {
+	const productPageURL = 'wp-admin/post-new.php?post_type=product';
+	const addProductPage = await browser.newPage();
+
+	// Go to "Add new product" page
+	await addProductPage.goto( productPageURL );
+
+	// Get the current user's ID and user preferences
+	const { id: userId, woocommerce_meta } = await addProductPage.evaluate(
+		() => {
+			return window.wp.data.select( 'core' ).getCurrentUser();
+		}
+	);
+
+	// Turn off the variable product tour
+	const updatedWooCommerceMeta = {
+		...woocommerce_meta,
+		variable_product_tour_shown: show ? '' : '"yes"',
+	};
+
+	// Save the updated user preferences
+	await addProductPage.evaluate(
+		async ( { userId, updatedWooCommerceMeta } ) => {
+			await window.wp.data.dispatch( 'core' ).saveUser( {
+				id: userId,
+				woocommerce_meta: updatedWooCommerceMeta,
+			} );
+		},
+		{ userId, updatedWooCommerceMeta }
+	);
+
+	// Close the page
+	await addProductPage.close();
+}
+
+/**
+ * Generate all possible variations from the given attributes.
+ *
+ * @param {{ name: string, visible: boolean, variation: boolean, options: string[] }[]} attributes
+ * @returns All possible variations from the given attributes
+ */
+function generateVariationsFromAttributes( attributes ) {
+	const combine = ( runningList, nextAttribute ) => {
+		const variations = [];
+		let newVar;
+
+		if ( ! Array.isArray( runningList[ 0 ] ) ) {
+			runningList = [ runningList ];
+		}
+
+		for ( const partialVariation of runningList ) {
+			if ( runningList.length === 1 ) {
+				for ( const startingAttribute of partialVariation ) {
+					for ( const nextAttrValue of nextAttribute ) {
+						newVar = [ startingAttribute, nextAttrValue ];
+						variations.push( newVar );
+					}
+				}
+			} else {
+				for ( const nextAttrValue of nextAttribute ) {
+					newVar = partialVariation.concat( [ nextAttrValue ] );
+					variations.push( newVar );
+				}
+			}
+		}
+
+		return variations;
+	};
+
+	let allVariations = attributes[ 0 ].options;
+
+	for ( let i = 1; i < attributes.length; i++ ) {
+		const nextAttribute = attributes[ i ].options;
+
+		allVariations = combine( allVariations, nextAttribute );
+	}
+
+	return allVariations;
+}
+
+/**
+ * Create variations through the WooCommerce REST API.
+ *
+ * @param {number} productId Product ID to add variations to.
+ * @param {{regular_price: string, attributes: {name: string, option: string}[]}[]} variations List of variations to create.
+ * @returns {Promise<number[]>} Array of variation ID's created.
+ */
+async function createVariations( productId, variations ) {
+	return await api.create.productVariations( productId, variations );
+}
+
+module.exports = {
+	createVariableProduct,
+	deleteProductsAddedByTests,
+	generateVariationsFromAttributes,
+	productAttributes,
+	showVariableProductTour,
+	sampleVariations,
+	createVariations,
+};
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/account/functions.php b/plugins/woocommerce/tests/legacy/unit-tests/account/functions.php
index 98c644c5e9d..b3305063794 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/account/functions.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/account/functions.php
@@ -52,7 +52,7 @@ class WC_Tests_Account_Functions extends WC_Unit_Test_Case {
 				'downloads'       => 'Downloads',
 				'edit-address'    => 'Addresses',
 				'edit-account'    => 'Account details',
-				'customer-logout' => 'Logout',
+				'customer-logout' => 'Log out',
 			),
 			wc_get_account_menu_items()
 		);
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/cart/cart.php b/plugins/woocommerce/tests/legacy/unit-tests/cart/cart.php
index f0e27b38d9f..80cc91f8438 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/cart/cart.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/cart/cart.php
@@ -2199,7 +2199,7 @@ class WC_Tests_Cart extends WC_Unit_Test_Case {
 
 	/**
 	 * Test that adding a variation via URL parameter succeeds when some attributes belong to the
-	 * variation and others are specificed via URL parameter.
+	 * variation and others are specified via URL parameter.
 	 */
 	public function test_add_variation_by_url_with_valid_attribute() {
 		add_filter( 'woocommerce_add_to_cart_redirect', '__return_false' );
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/coupon/data.php b/plugins/woocommerce/tests/legacy/unit-tests/coupon/data.php
index 13f229b97cd..853bff061e0 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/coupon/data.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/coupon/data.php
@@ -30,7 +30,7 @@ class WC_Tests_Coupon_Data extends WC_Unit_Test_Case {
 	 * @since 3.0.0
 	 */
 	public function test_coupon_backwards_compat_props_use_correct_getters() {
-		// Accessing properties directly will throw some wanted deprected notices
+		// Accessing properties directly will throw some wanted deprecated notices
 		// So we need to let PHPUnit know we are expecting them and it's fine to continue
 		$legacy_keys                   = array(
 			'id',
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/customer/crud.php b/plugins/woocommerce/tests/legacy/unit-tests/customer/crud.php
index 6b09a159d7d..ffc37b660ba 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/customer/crud.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/customer/crud.php
@@ -118,7 +118,7 @@ class WC_Tests_CustomerCRUD extends WC_Unit_Test_Case {
 	 */
 	public function test_customer_backwards_compat() {
 		// Properties.
-		// Accessing properties directly will throw some wanted deprected notices
+		// Accessing properties directly will throw some wanted deprecated notices
 		// So we need to let PHPUnit know we are expecting them and it's fine to continue
 		$legacy_keys = array(
 			'id',
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/email/emails.php b/plugins/woocommerce/tests/legacy/unit-tests/email/emails.php
index 40a6b3a6333..80664a6944b 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/email/emails.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/email/emails.php
@@ -51,7 +51,7 @@ class WC_Tests_WC_Emails extends WC_Unit_Test_Case {
 	}
 
 	/**
-	 * Test that we remove elemets with style display none from html mails.
+	 * Test that we remove elements with style display none from html mails.
 	 */
 	public function test_remove_display_none_elements() {
 		$email = new WC_Email();
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/importer/product.php b/plugins/woocommerce/tests/legacy/unit-tests/importer/product.php
index 8156bb46297..8dab5d27b29 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/importer/product.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/importer/product.php
@@ -700,7 +700,9 @@ class WC_Tests_Product_CSV_Importer extends WC_Unit_Test_Case {
 	 * Test that directory traversal is prevented.
 	 */
 	public function test_server_path_traversal() {
-		self::file_copy( $this->csv_file, ABSPATH . '../sample.csv' );
+		if ( ! file_exists( ABSPATH . '../sample.csv' ) ) {
+			self::file_copy( $this->csv_file, ABSPATH . '../sample.csv' );
+		}
 
 		$_POST['file_url'] = '../sample.csv';
 		$import_controller = new WC_Product_CSV_Importer_Controller();
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/libraries/class-wc-mock-background-process.php b/plugins/woocommerce/tests/legacy/unit-tests/libraries/class-wc-mock-background-process.php
index eab4269c3c7..2cc6da806d9 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/libraries/class-wc-mock-background-process.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/libraries/class-wc-mock-background-process.php
@@ -60,7 +60,7 @@ class WC_Mock_Background_Process extends WC_Background_Process {
 	 * @return bool
 	 */
 	protected function task( $item ) {
-		// We sleep for 5 seconds to mimic a long running tast to complete some tests.
+		// We sleep for 5 seconds to mimic a long running task to complete some tests.
 		sleep( 5 );
 		update_option( $item['mock_key'], $item['mock_value'] );
 		return false;
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/order/class-wc-tests-orders.php b/plugins/woocommerce/tests/legacy/unit-tests/order/class-wc-tests-orders.php
index 9073011470f..9409e2088ed 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/order/class-wc-tests-orders.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/order/class-wc-tests-orders.php
@@ -53,7 +53,7 @@ class WC_Tests_Orders extends WC_Unit_Test_Case {
 	}
 
 	/**
-	 * Test shipping is added and rounded correctly when addedd to total.
+	 * Test shipping is added and rounded correctly when added to total.
 	 *
 	 * @throws WC_Data_Exception When lines cannot be added to order.
 	 */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/order/coupons.php b/plugins/woocommerce/tests/legacy/unit-tests/order/coupons.php
index a5306b1544e..4e7f5d20a70 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/order/coupons.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/order/coupons.php
@@ -191,7 +191,7 @@ class WC_Tests_Order_Coupons extends WC_Unit_Test_Case {
 		$this->assertEquals( '799.00', $order->get_total(), $order->get_total() );
 
 		/**
-		 * Discount should be based on subtotal unless coupons apply sequencially.
+		 * Discount should be based on subtotal unless coupons apply sequentially.
 		 *
 		 * Coupon will therefore discount 200. Compare the total without tax so we can compare the ex tax price and avoid rounding mishaps.
 		 */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/product/data-store.php b/plugins/woocommerce/tests/legacy/unit-tests/product/data-store.php
index 586392ac3a8..d6359bb91de 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/product/data-store.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/product/data-store.php
@@ -681,7 +681,7 @@ class WC_Tests_Product_Data_Store extends WC_Unit_Test_Case {
 		// Check the variation with a multiword attribute name.
 		$this->assertEquals( 'color: Green, mounting-plate: galaxy-s6, support: one-year', $multiword_attribute_variation->get_attribute_summary() );
 
-		// Add atributes to parent so that they are loaded correctly for variation.
+		// Add attributes to parent so that they are loaded correctly for variation.
 		$attribute_1 = new WC_Product_Attribute();
 		$attribute_1->set_name( 'color' );
 		$attribute_1->set_options( array( 'Green', 'Blue' ) );
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php b/plugins/woocommerce/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php
index 1bd00c5c637..8c19b7e27a6 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/rest-api/Tests/Version3/payment-gateways.php
@@ -247,7 +247,7 @@ class Payment_Gateways extends WC_REST_Unit_Test_Case {
 		$this->assertEquals( 'woo@woo.local', $paypal['settings']['email']['value'] );
 		$this->assertEquals( 'yes', $paypal['settings']['testmode']['value'] );
 
-		// Test bogus paramter.
+		// Test bogus parameter.
 		$request = new WP_REST_Request( 'POST', '/wc/v3/payment_gateways/paypal' );
 		$request->set_body_params(
 			array(
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/tax/tax.php b/plugins/woocommerce/tests/legacy/unit-tests/tax/tax.php
index 2f09f85235f..f0124d823d2 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/tax/tax.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/tax/tax.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Test tax funcitons.
+ * Test tax functions.
  *
  * @package WooCommerce\Tests\Tax
  * @since   3.4.0
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/templates/functions.php b/plugins/woocommerce/tests/legacy/unit-tests/templates/functions.php
index 818ae56e809..6756dd85078 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/templates/functions.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/templates/functions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Test template funcitons.
+ * Test template functions.
  *
  * @package WooCommerce\Tests\Templates
  * @since   3.4.0
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/util/conditional-functions.php b/plugins/woocommerce/tests/legacy/unit-tests/util/conditional-functions.php
index b7d3a24d25d..5cd8b7d4382 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/util/conditional-functions.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/util/conditional-functions.php
@@ -74,7 +74,7 @@ class WC_Tests_Conditional_Functions extends WC_Unit_Test_Case {
 	}
 
 	/**
-	 * Callback for chaning home url to https.
+	 * Callback for changing home url to https.
 	 *
 	 * @return string
 	 */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php b/plugins/woocommerce/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php
index 9390074dd0d..aca4f33fb29 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/widgets/class-wc-tests-widget.php
@@ -10,7 +10,7 @@
  */
 class WC_Tests_Widget extends WC_Unit_Test_Case {
 	/**
-	 * Test intance creation
+	 * Test instance creation
 	 *
 	 * @return void
 	 */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api-init.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api-init.php
index ff2855420f8..1535b6ed90b 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api-init.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api-init.php
@@ -77,7 +77,7 @@ class WC_Admin_Tests_API_Init extends WC_REST_Unit_Test_Case {
 		// Clear the existing action queue (the above save adds an action).
 		$this->queue->actions = array();
 
-		// Force a failure by sabotaging the query run after retreiving order coupons.
+		// Force a failure by sabotaging the query run after retrieving order coupons.
 		add_filter( 'query', array( $this, 'filter_order_query' ) );
 
 		// Initiate sync.
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php
index b70e973b83f..b40e02390ea 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php
@@ -85,7 +85,7 @@ class WC_Admin_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
 	}
 
 	/**
-	 * Test the import paramaters.
+	 * Test the import parameters.
 	 */
 	public function test_import_params() {
 		global $wpdb;
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php
index 719bd74c02b..19478477f3a 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php
@@ -184,8 +184,8 @@ class WC_Admin_Tests_API_Reports_Orders extends WC_REST_Unit_Test_Case {
 		$bad_args = array(
 			'not an array!',                   // Not an array.
 			array( 1, 2, 3 ),                  // Not a tuple.
-			array( -1, $small_term->term_id ), // Invaid attribute ID.
-			array( $size_attr_id, -1 ),        // Invaid term ID.
+			array( -1, $small_term->term_id ), // Invalid attribute ID.
+			array( $size_attr_id, -1 ),        // Invalid term ID.
 		);
 
 		foreach ( $bad_args as $bad_arg ) {
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/class-wc-tests-shipping-label-banner-display-rules.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/class-wc-tests-shipping-label-banner-display-rules.php
index 9744f57fc97..e0daecd2d80 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/class-wc-tests-shipping-label-banner-display-rules.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/class-wc-tests-shipping-label-banner-display-rules.php
@@ -20,7 +20,7 @@ class WC_Admin_Tests_Shipping_Label_Banner_Display_Rules extends WC_Unit_Test_Ca
 	private $valid_jetpack_version = '4.4';
 
 	/**
-	 * Stores the default WordPress options stored in teh database.
+	 * Stores the default WordPress options stored in the database.
 	 *
 	 * @var array
 	 */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task-list.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task-list.php
index 0d57109a7b8..a7c8e931ae5 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task-list.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task-list.php
@@ -409,7 +409,7 @@ class WC_Admin_Tests_OnboardingTasks_TaskList extends WC_Unit_Test_Case {
 	}
 
 	/**
-	 * Test that the list ID is retreived.
+	 * Test that the list ID is retrieved.
 	 */
 	public function test_get_list_id() {
 		$this->assertEquals( 'setup', $this->list->get_list_id() );
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task.php
index bebd752a96f..6bfee646306 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/task.php
@@ -296,7 +296,7 @@ class WC_Admin_Tests_OnboardingTasks_Task extends WC_Unit_Test_Case {
 	}
 
 	/**
-	 * Test that the parent list ID is retreived.
+	 * Test that the parent list ID is retrieved.
 	 */
 	public function test_get_list_id() {
 		$task = new TestTask(
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/tasks/purchase.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/tasks/purchase.php
index ad2bb208a4e..043052a0371 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/tasks/purchase.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/tasks/purchase.php
@@ -82,7 +82,6 @@ class WC_Admin_Tests_OnboardingTasks_Task_Purchase extends WC_Unit_Test_Case {
 	 * Test is_complete function of Purchase task.
 	 */
 	public function test_is_not_complete_if_remaining_paid_products() {
-		$this->markTestSkipped( 'Skipped temporarily due to change in endpoint behavior.' );
 		update_option( OnboardingProfile::DATA_OPTION, array( 'product_types' => array( 'memberships' ) ) );
 		$this->assertEquals( false, $this->task->is_complete() );
 	}
@@ -161,7 +160,6 @@ class WC_Admin_Tests_OnboardingTasks_Task_Purchase extends WC_Unit_Test_Case {
 	 * Test the task title if 2 paid items exist.
 	 */
 	public function test_get_title_if_multiple_paid_themes() {
-		$this->markTestSkipped( 'Skipped temporarily due to change in endpoint behavior.' );
 		update_option(
 			OnboardingProfile::DATA_OPTION,
 			array(
@@ -176,7 +174,6 @@ class WC_Admin_Tests_OnboardingTasks_Task_Purchase extends WC_Unit_Test_Case {
 	 * Test the task title if multiple additional paid items exist.
 	 */
 	public function test_get_title_if_multiple_paid_products() {
-		$this->markTestSkipped( 'Skipped temporarily due to change in endpoint behavior.' );
 		update_option(
 			OnboardingProfile::DATA_OPTION,
 			array(
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/test-task.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/test-task.php
index 262a9503305..f5c840bdb7a 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/test-task.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/onboarding-tasks/test-task.php
@@ -79,7 +79,7 @@ class TestTask extends Task {
 	}
 
 	/**
-	 * Additonal info.
+	 * Additional info.
 	 *
 	 * @return string
 	 */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/payment-gateway-suggestions/evaluate-suggestion.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/payment-gateway-suggestions/evaluate-suggestion.php
index 89443db9cb7..25063d26ed3 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/payment-gateway-suggestions/evaluate-suggestion.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/features/payment-gateway-suggestions/evaluate-suggestion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Test the class that evalutes payment gateway suggestion visibility.
+ * Test the class that evaluates payment gateway suggestion visibility.
  *
  * @package WooCommerce\Admin\Tests\PaymentGatewaySuggestions
  */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php
index e57e5f360b3..37a9a235892 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php
@@ -16,7 +16,7 @@ use Automattic\WooCommerce\Admin\API\Reports\Customers\Stats\DataStore;
 class WC_Admin_Tests_Reports_Customer extends WC_Unit_Test_Case {
 
 	/**
-	 * Test order count caluclation for customer.
+	 * Test order count calculation for customer.
 	 *
 	 * @covers \Automattic\WooCommerce\Admin\API\Reports\Customers\DataStore::get_order_count
 	 */
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/wc-admin-assets.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/wc-admin-assets.php
index 5b60e959952..2b7723528a8 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/wc-admin-assets.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/wc-admin-assets.php
@@ -28,7 +28,7 @@ class WC_Admin_Tests_WCAdminAssets extends WP_UnitTestCase {
 	}
 
 	/**
-	 * Fitler to enable unminified-js feature.
+	 * Filter to enable unminified-js feature.
 	 *
 	 * @param  array $features Array of active features.
 	 */
diff --git a/plugins/woocommerce/tests/performance/README.md b/plugins/woocommerce/tests/performance/README.md
index 87515c3d014..2364ed7df08 100644
--- a/plugins/woocommerce/tests/performance/README.md
+++ b/plugins/woocommerce/tests/performance/README.md
@@ -11,7 +11,7 @@ Automated k6 performance tests for WooCommerce. To be used for benchmarking perf
   - [Config Variables](#config-variables)
 - [Scenarios](#scenarios)
 - [Running Tests](#running-tests)
-  - [Running Indvidual Tests](#running-individual-tests)
+  - [Running Individual Tests](#running-individual-tests)
   - [Running Scenarios](#running-scenarios)
   - [Debugging Tests](#debugging-tests)
   - [User Agent](#user-agent)
@@ -102,10 +102,10 @@ think_time_max | maximum sleep time (in seconds) between each request | no
 ---
 ## Running Tests
 
-When refering to running k6 tests usually this means executing the test scenario. The test scenario file in turn determines which requests we run and how much load will be applied to them. It is also possible to execute individual test files containing requests and pass in scenario config as a CLI flag but scenario files allow for more configuration options.
+When referring to running k6 tests usually this means executing the test scenario. The test scenario file in turn determines which requests we run and how much load will be applied to them. It is also possible to execute individual test files containing requests and pass in scenario config as a CLI flag but scenario files allow for more configuration options.
 
 ---
-### Running Indvidual Tests
+### Running Individual Tests
 
 To execute an individual test file (for example `requests/shopper/shop-page.js`)  containing requests.
 
@@ -129,7 +129,7 @@ Another aspect that affects the traffic pattern of the tests is the amount of 
 To do this a sleep step is included between each request ``sleep(randomIntBetween(`${think_time_min}`, `${think_time_max}`))``.
 The amount of think time can be controlled from `config.js`.
 
->**_Note: It’s important to note to be very careful when adding load to a scenario. By accident a dangerous amount of load could be ran aginst the test environment that could effectively be like a denial-of-service attack on the test environment. Also important to consider any other consequences of running large load such as triggering of emails._**
+>**_Note: It’s important to note to be very careful when adding load to a scenario. By accident a dangerous amount of load could be ran against the test environment that could effectively be like a denial-of-service attack on the test environment. Also important to consider any other consequences of running large load such as triggering of emails._**
 
 To execute a test scenario (for example `tests/simple-all-requests.js`).
 
@@ -202,7 +202,7 @@ Create a custom Grafana dashboard using [these instructions](https://k6.io/docs/
 
 k6 tests rely on HTTP requests in order to test the backend. They can either be constructed from scratch, by using the k6 recorder, or by converting a HAR file.
 
-The k6 recorder is a browser extension which captures http requests generated as you perform actions in a tab. It generates a test with all the HTTP requests from your actions which can then be modified to make it execuatable.
+The k6 recorder is a browser extension which captures http requests generated as you perform actions in a tab. It generates a test with all the HTTP requests from your actions which can then be modified to make it executable.
 
 Alternatively any application which captures HTTP requests can be used to figure out the requests to include in a test such as the network section within browser developer tools.
 
@@ -246,9 +246,9 @@ Groups are used to organize common logic in the test scripts and can help with t
 
 Checks are like asserts but they don’t stop the tests if they record a failure (for example in a load test with 1000s of iterations of a request this allows for an isolated flakey iteration to not stop test execution).
 
-All requests have had checks for at least a `200` http status repsonse added and most also have an additional check for a string contained in the response body.
+All requests have had checks for at least a `200` http status response added and most also have an additional check for a string contained in the response body.
 
 ---
 ## Other Resources
 
-[k6 documention](https://k6.io/docs/) is a very useful resource for test creation and execution.
+[k6 documentation](https://k6.io/docs/) is a very useful resource for test creation and execution.
diff --git a/plugins/woocommerce/tests/performance/bin/init-sample-products.sh b/plugins/woocommerce/tests/performance/bin/init-sample-products.sh
index e5a941876f4..6a80d5ef368 100755
--- a/plugins/woocommerce/tests/performance/bin/init-sample-products.sh
+++ b/plugins/woocommerce/tests/performance/bin/init-sample-products.sh
@@ -8,15 +8,6 @@ wp-env run tests-cli "wp plugin activate woocommerce"
 
 wp-env run tests-cli "wp user create customer customer@woocommercecoree2etestsuite.com --user_pass=password --role=subscriber --path=/var/www/html"
 
-# we cannot create API keys for the API, so we using basic auth, this plugin allows that.
-wp-env run tests-cli "wp plugin install https://github.com/WP-API/Basic-Auth/archive/master.zip --activate"
-
-# update permalinks to `pretty` to make it easier for testing APIs with k6
-wp-env run tests-cli "wp option update permalink_structure /%postname%/"
-
-# install the WP Mail Logging plugin to test emails
-wp-env run tests-cli "wp plugin install wp-mail-logging --activate"
-
 # Installing and activating the WordPress Importer plugin to import sample products"
 wp-env run tests-cli "wp plugin install wordpress-importer --activate"
 
@@ -43,8 +34,7 @@ wp-env run tests-cli "wp theme install storefront --activate"
 
 echo "Success! Your E2E Test Environment is now ready."
 
-
 if [ $ENABLE_HPOS == 1 ]; then
-	echo 'Enable the COT feature'
+	echo "Enable the COT feature"
 	wp-env run tests-cli "wp plugin install https://gist.github.com/vedanshujain/564afec8f5e9235a1257994ed39b1449/archive/b031465052fc3e04b17624acbeeb2569ef4d5301.zip --activate"
 fi
diff --git a/plugins/woocommerce/tests/performance/requests/api/orders.js b/plugins/woocommerce/tests/performance/requests/api/orders.js
index f832fcc696a..26ca0fb6a98 100644
--- a/plugins/woocommerce/tests/performance/requests/api/orders.js
+++ b/plugins/woocommerce/tests/performance/requests/api/orders.js
@@ -186,6 +186,10 @@ export function ordersAPI() {
 	group( 'API Batch Update Orders', function () {
 		let updateBatchItem;
 
+		if ( ! post_ids ) {
+			return;
+		}
+
 		for ( let index = 0; index < batchSize; index++ ) {
 			updateBatchItem = {
 				id: `${ post_ids[ index ] }`,
diff --git a/plugins/woocommerce/tests/performance/requests/merchant/add-order.js b/plugins/woocommerce/tests/performance/requests/merchant/add-order.js
index a39788bae2b..a7c303e4228 100644
--- a/plugins/woocommerce/tests/performance/requests/merchant/add-order.js
+++ b/plugins/woocommerce/tests/performance/requests/merchant/add-order.js
@@ -74,7 +74,7 @@ if ( cot_status === true ) {
 const date = new Date();
 const order_date = date.toJSON().slice( 0, 10 );
 
-export function addOrder() {
+export function addOrder( includeTests = {} ) {
 	let response;
 	let ajax_nonce_add_meta;
 	let wpnonce;
@@ -87,6 +87,15 @@ export function addOrder() {
 	let api_x_wp_nonce;
 	let apiNonceHeader;
 	let heartbeat_nonce;
+	let includedTests = Object.assign( {
+			create: true,
+			heartbeat: true,
+			open: true,
+			other: true,
+			update: true,
+		},
+		includeTests
+	);
 
 	group( 'Add Order', function () {
 		const requestHeaders = Object.assign(
@@ -170,75 +179,430 @@ export function addOrder() {
 
 	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
 
-	group( 'All Orders - Other Requests', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonAPIRequestHeader,
-			commonRequestHeaders,
-			commonAPIGetRequestHeaders,
-			apiNonceHeader,
-			commonNonStandardHeaders
-		);
+	if ( includedTests.other ) {
+		group( 'All Orders - Other Requests', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonAPIRequestHeader,
+				commonRequestHeaders,
+				commonAPIGetRequestHeaders,
+				apiNonceHeader,
+				commonNonStandardHeaders
+			);
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
+					`type=error%2Cupdate&status=unactioned&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-analytics/admin/notes?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: {
+						name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
+					},
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+		} );
+	}
+
+	if ( includedTests.heartbeat ) {
+		group( 'WP Admin Heartbeat', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonRequestHeader,
+				commonRequestHeaders,
+				contentTypeRequestHeader,
+				commonPostRequestHeaders,
+				commonNonStandardHeaders
+			);
+
+			response = http.post(
+				`${ base_url }/wp-admin/admin-ajax.php`,
+				`_nonce=${ heartbeat_nonce }&action=heartbeat&has_focus=true&interval=15&screen_id=shop_order`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - action=heartbeat' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
-				`type=error%2Cupdate&status=unactioned&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-analytics/admin/notes?' },
+		sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	}
+
+	if ( includedTests.create ) {
+		group( 'Create New Order', function () {
+			const requestHeaders = Object.assign(
+				{},
+				htmlRequestHeader,
+				commonRequestHeaders,
+				commonGetRequestHeaders,
+				contentTypeRequestHeader,
+				commonNonStandardHeaders
+			);
+
+			const date = new Date();
+			const order_date = date.toJSON().slice( 0, 10 );
+
+			const orderParams = new URLSearchParams( [
+				[ '_ajax_nonce-add-meta', `${ ajax_nonce_add_meta }` ],
+				[ '_billing_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_billing_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_billing_city', `${ addresses_guest_billing_city }` ],
+				[ '_billing_company', `${ addresses_guest_billing_company }` ],
+				[ '_billing_country', `${ addresses_guest_billing_country }` ],
+				[ '_billing_email', `${ addresses_guest_billing_email }` ],
+				[
+					'_billing_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_billing_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_billing_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_billing_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_billing_state', `${ addresses_guest_billing_state }` ],
+				[ '_shipping_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_shipping_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_shipping_city', `${ addresses_guest_billing_city }` ],
+				[ '_shipping_company', `${ addresses_guest_billing_company }` ],
+				[ '_shipping_country', `${ addresses_guest_billing_country }` ],
+				[
+					'_shipping_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_shipping_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_shipping_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_shipping_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_shipping_state', `${ addresses_guest_billing_state }` ],
+				[ '_payment_method', `${ payment_method }` ],
+				[ '_transaction_id', '' ],
+				[ '_wp_http_referer', '' ],
+				[ '_wp_original_http_referer', '' ],
+				[ '_wpnonce', `${ wpnonce }` ],
+				[ 'action', 'editpost' ],
+				[ 'auto_draft', '1' ], //no
+				[ 'closedpostboxesnonce', `${ closed_postboxes_nonce }` ],
+				[ 'customer_user', '' ],
+				[ 'excerpt', '' ],
+				[ 'meta-box-order-nonce', `${ meta_box_order_nonce }` ],
+				[ 'metakeyinput', '' ],
+				[ 'metakeyselect', '%23NONE%23' ],
+				[ 'metavalue', '' ],
+				[ 'order_date', `${ order_date }` ],
+				[ 'order_date_hour', '01' ],
+				[ 'order_date_minute', '01' ],
+				[ 'order_date_second', '01' ],
+				[ 'order_note', '' ],
+				[ 'order_note_type', '' ],
+				[ 'order_status', 'wc-pending' ],
+				[ 'original_post_status', 'auto-draft' ],
+				[ 'original_post_title', '' ],
+				[ 'originalaction', 'editpost' ],
+				[ 'post_ID', `${ post_id }` ],
+				[ 'post_author', '1' ],
+				[ 'post_status', 'auto-draft' ],
+				[ 'post_title', '%2COrder' ],
+				[ 'post_type', 'shop_order' ],
+				[ 'referredby', '' ],
+				[ 'samplepermalinknonce', `${ sample_permalink_nonce }` ],
+				[ 'save', 'Create' ],
+				[ 'user_ID', '1' ],
+				[ 'wc_order_action', '' ],
+				[ 'woocommerce_meta_nonce', `${ woocommerce_meta_nonce }` ],
+			] );
+
+			const cotOrderParams = new URLSearchParams( [
+				[ '_ajax_nonce-add-meta', `${ ajax_nonce_add_meta }` ],
+				[ '_billing_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_billing_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_billing_city', `${ addresses_guest_billing_city }` ],
+				[ '_billing_company', `${ addresses_guest_billing_company }` ],
+				[ '_billing_country', `${ addresses_guest_billing_country }` ],
+				[ '_billing_email', `${ addresses_guest_billing_email }` ],
+				[
+					'_billing_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_billing_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_billing_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_billing_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_billing_state', `${ addresses_guest_billing_state }` ],
+				[ '_shipping_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_shipping_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_shipping_city', `${ addresses_guest_billing_city }` ],
+				[ '_shipping_company', `${ addresses_guest_billing_company }` ],
+				[ '_shipping_country', `${ addresses_guest_billing_country }` ],
+				[
+					'_shipping_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_shipping_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_shipping_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_shipping_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_shipping_state', `${ addresses_guest_billing_state }` ],
+				[ '_payment_method', `${ payment_method }` ],
+				[ '_transaction_id', '' ],
+				[ '_wp_http_referer', '' ],
+				[ '_wpnonce', `${ wpnonce }` ],
+				[ 'action', 'edit_order' ],
+				[ 'customer_user', '' ],
+				[ 'excerpt', '' ],
+				[ 'metakeyinput', '' ],
+				[ 'metavalue', '' ],
+				[ 'order_date', `${ order_date }` ],
+				[ 'order_date_hour', '01' ],
+				[ 'order_date_minute', '01' ],
+				[ 'order_date_second', '01' ],
+				[ 'order_note', '' ],
+				[ 'order_note_type', '' ],
+				[ 'order_status', 'wc-pending' ],
+				[ 'original_order_status', 'auto-draft' ],
+				[ 'post_status', 'auto-draft' ],
+				[ 'post_title', 'Order' ],
+				[ 'referredby', '' ],
+				[ 'save', 'Create' ],
+				[ 'wc_order_action', '' ],
+				[ 'woocommerce_meta_nonce', `${ woocommerce_meta_nonce }` ],
+			] );
+
+			if ( cot_status === true ) {
+				admin_update_order = `${ admin_update_order_base }&id=${ hpos_post_id }`;
+				admin_update_order_params = cotOrderParams.toString();
+			} else {
+				admin_update_order = admin_update_order_base;
+				admin_update_order_params = orderParams.toString();
 			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+
+			response = http.post(
+				`${ base_url }/wp-admin/${ admin_update_order }`,
+				admin_update_order_params.toString(),
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - Create New Order' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+				"body contains: 'Edit order' header": ( response ) =>
+					response.body.includes( `${ admin_open_order_assert }` ),
+				"body contains: 'Order updated' confirmation": ( response ) =>
+					response.body.includes( `${ admin_created_order_assert }` ),
+			} );
 		} );
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: {
-					name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
-				},
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-		} );
-	} );
+		sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	}
 
-	group( 'WP Admin Heartbeat', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonRequestHeader,
-			commonRequestHeaders,
-			contentTypeRequestHeader,
-			commonPostRequestHeaders,
-			commonNonStandardHeaders
-		);
+	if ( includedTests.open ) {
+		group( 'Open Order', function () {
+			const requestHeaders = Object.assign(
+				{},
+				htmlRequestHeader,
+				commonRequestHeaders,
+				commonGetRequestHeaders,
+				commonNonStandardHeaders
+			);
 
-		response = http.post(
-			`${ base_url }/wp-admin/admin-ajax.php`,
-			`_nonce=${ heartbeat_nonce }&action=heartbeat&has_focus=true&interval=15&screen_id=shop_order`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - action=heartbeat' },
+			if ( cot_status === true ) {
+				admin_open_order_base = `${ admin_update_order_base }&id=${ hpos_post_id }`;
+			} else {
+				admin_open_order_base = `${ admin_update_order_base }?post=${ post_id }`;
 			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+
+			response = http.get(
+				`${ base_url }/wp-admin/${ admin_open_order_base }&action=edit`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - Open Order' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+				"body contains: 'Edit order' header": ( response ) =>
+					response.body.includes( `${ admin_open_order_assert }` ),
+			} );
 		} );
-	} );
+
+		sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	}
+
+	if ( includedTests.update ) {
+		group( 'Update Order', function () {
+			const requestHeaders = Object.assign(
+				{},
+				htmlRequestHeader,
+				commonRequestHeaders,
+				commonGetRequestHeaders,
+				contentTypeRequestHeader,
+				commonNonStandardHeaders
+			);
+
+			const orderParams = new URLSearchParams( [
+				[ '_ajax_nonce-add-meta', `${ ajax_nonce_add_meta }` ],
+				[ '_billing_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_billing_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_billing_city', `${ addresses_guest_billing_city }` ],
+				[ '_billing_company', `${ addresses_guest_billing_company }` ],
+				[ '_billing_country', `${ addresses_guest_billing_country }` ],
+				[ '_billing_email', `${ addresses_guest_billing_email }` ],
+				[
+					'_billing_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_billing_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_billing_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_billing_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_billing_state', `${ addresses_guest_billing_state }` ],
+				[ '_shipping_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_shipping_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_shipping_city', `${ addresses_guest_billing_city }` ],
+				[ '_shipping_company', `${ addresses_guest_billing_company }` ],
+				[ '_shipping_country', `${ addresses_guest_billing_country }` ],
+				[
+					'_shipping_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_shipping_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_shipping_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_shipping_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_shipping_state', `${ addresses_guest_billing_state }` ],
+				[ '_payment_method', `${ payment_method }` ],
+				[ '_transaction_id', '' ],
+				[ '_wp_http_referer', '' ],
+				[ '_wp_original_http_referer', '' ],
+				[ '_wpnonce', `${ wpnonce }` ],
+				[ 'action', 'editpost' ],
+				[ 'closedpostboxesnonce', `${ closed_postboxes_nonce }` ],
+				[ 'customer_user', '' ],
+				[ 'excerpt', '' ],
+				[ 'meta-box-order-nonce', `${ meta_box_order_nonce }` ],
+				[ 'metakeyinput', '' ],
+				[ 'metakeyselect', '%23NONE%23' ],
+				[ 'metavalue', '' ],
+				[ 'order_date', `${ order_date }` ],
+				[ 'order_date_hour', '01' ],
+				[ 'order_date_minute', '01' ],
+				[ 'order_date_second', '01' ],
+				[ 'order_note', '' ],
+				[ 'order_note_type', '' ],
+				[ 'order_status', 'wc-completed' ],
+				[ 'original_post_status', 'wc-pending' ],
+				[ 'original_post_title', '' ],
+				[ 'originalaction', 'editpost' ],
+				[ 'post_ID', `${ post_id }` ],
+				[ 'post_author', '1' ],
+				[ 'post_status', 'pending' ],
+				[ 'post_title', '%2COrder' ],
+				[ 'post_type', 'shop_order' ],
+				[ 'referredby', '' ],
+				[ 'samplepermalinknonce', `${ sample_permalink_nonce }` ],
+				[ 'save', 'Update' ],
+				[ 'user_ID', '1' ],
+				[ 'wc_order_action', '' ],
+				[ 'woocommerce_meta_nonce', `${ woocommerce_meta_nonce }` ],
+			] );
+
+			const cotOrderParams = new URLSearchParams( [
+				[ '_ajax_nonce-add-meta', `${ ajax_nonce_add_meta }` ],
+				[ '_billing_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_billing_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_billing_city', `${ addresses_guest_billing_city }` ],
+				[ '_billing_company', `${ addresses_guest_billing_company }` ],
+				[ '_billing_country', `${ addresses_guest_billing_country }` ],
+				[ '_billing_email', `${ addresses_guest_billing_email }` ],
+				[
+					'_billing_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_billing_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_billing_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_billing_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_billing_state', `${ addresses_guest_billing_state }` ],
+				[ '_shipping_address_1', `${ addresses_guest_billing_address_1 }` ],
+				[ '_shipping_address_2', `${ addresses_guest_billing_address_2 }` ],
+				[ '_shipping_city', `${ addresses_guest_billing_city }` ],
+				[ '_shipping_company', `${ addresses_guest_billing_company }` ],
+				[ '_shipping_country', `${ addresses_guest_billing_country }` ],
+				[
+					'_shipping_first_name',
+					`${ addresses_guest_billing_first_name }`,
+				],
+				[ '_shipping_last_name', `${ addresses_guest_billing_last_name }` ],
+				[ '_shipping_phone', `${ addresses_guest_billing_phone }` ],
+				[ '_shipping_postcode', `${ addresses_guest_billing_postcode }` ],
+				[ '_shipping_state', `${ addresses_guest_billing_state }` ],
+				[ '_payment_method', `${ payment_method }` ],
+				[ '_transaction_id', '' ],
+				[ '_wp_http_referer', '' ],
+				[ '_wpnonce', `${ wpnonce }` ],
+				[ 'action', 'edit_order' ],
+				[ 'customer_user', '' ],
+				[ 'excerpt', '' ],
+				[ 'metakeyinput', '' ],
+				[ 'metavalue', '' ],
+				[ 'order_date', `${ order_date }` ],
+				[ 'order_date_hour', '01' ],
+				[ 'order_date_minute', '01' ],
+				[ 'order_date_second', '01' ],
+				[ 'order_note', '' ],
+				[ 'order_note_type', '' ],
+				[ 'order_status', 'wc-completed' ],
+				[ 'original_order_status', 'pending' ],
+				[ 'post_status', 'pending' ],
+				[ 'post_title', 'Order' ],
+				[ 'referredby', '' ],
+				[ 'save', 'Save' ],
+				[ 'wc_order_action', '' ],
+				[ 'woocommerce_meta_nonce', `${ woocommerce_meta_nonce }` ],
+			] );
+
+			if ( cot_status === true ) {
+				admin_update_order_id = `${ admin_update_order_base }&id=${ hpos_post_id }`;
+				admin_update_order_params = cotOrderParams.toString();
+			} else {
+				admin_update_order_params = orderParams.toString();
+				admin_update_order_id = `${ admin_open_order_base }`;
+			}
+
+			response = http.post(
+				`${ base_url }/wp-admin/${ admin_update_order_id }`,
+				admin_update_order_params.toString(),
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - Update Existing Order Status' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+				"body contains: 'Order updated' confirmation": ( response ) =>
+					response.body.includes( `${ admin_update_order_assert }` ),
+			} );
+		} );
+	}
 
 	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
 
@@ -584,7 +948,7 @@ export function addOrder() {
 				response.body.includes( `${ admin_update_order_assert }` ),
 		} );
 	} );
-}
+};
 
 export default function () {
 	addOrder();
diff --git a/plugins/woocommerce/tests/performance/requests/merchant/add-product.js b/plugins/woocommerce/tests/performance/requests/merchant/add-product.js
index 44d9f7dcb56..67c66b9c892 100644
--- a/plugins/woocommerce/tests/performance/requests/merchant/add-product.js
+++ b/plugins/woocommerce/tests/performance/requests/merchant/add-product.js
@@ -33,7 +33,7 @@ import {
 	allRequestHeader,
 } from '../../headers.js';
 
-export function addProduct() {
+export function addProduct( includeTests = {} ) {
 	let response;
 	let heartbeat_nonce;
 	let ajax_nonce_add_meta;
@@ -46,6 +46,14 @@ export function addProduct() {
 	let post_id;
 	let api_x_wp_nonce;
 	let apiNonceHeader;
+	let includedTests = Object.assign( {
+			heartbeat: true,
+			other: true,
+			permalink: true,
+			update: true,
+		},
+		includeTests
+	);
 
 	group( 'Add New Product', function () {
 		const requestHeaders = Object.assign(
@@ -130,242 +138,250 @@ export function addProduct() {
 
 	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
 
-	group( 'Add New Product - Other Requests', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonAPIRequestHeader,
-			commonRequestHeaders,
-			commonAPIGetRequestHeaders,
-			apiNonceHeader,
-			commonNonStandardHeaders
-		);
+	if ( includedTests.other ) {
+		group( 'Add New Product - Other Requests', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonAPIRequestHeader,
+				commonRequestHeaders,
+				commonAPIGetRequestHeaders,
+				apiNonceHeader,
+				commonNonStandardHeaders
+			);
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
+					`type=error%2Cupdate&status=unactioned&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-analytics/admin/notes?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: {
+						name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
+					},
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
-				`type=error%2Cupdate&status=unactioned&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-analytics/admin/notes?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-		} );
+		sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	}
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: {
-					name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
+	if ( includedTests.heartbeat ) {
+		group( 'Autosave heartbeat', function () {
+			const requestHeaders = Object.assign(
+				{},
+				commonNonStandardHeaders,
+				jsonAPIRequestHeader,
+				commonPostRequestHeaders,
+				commonRequestHeaders
+			);
+
+			response = http.post(
+				`${ base_url }/wp-admin/admin-ajax.php`,
+				{
+					_nonce: `${ heartbeat_nonce }`,
+					action: 'heartbeat',
+					'data%5Bwp-refresh-post-lock%5D%5Bpost_id%5D': `${ post_id }`,
+					'data%5Bwp_autosave%5D%5B_wpnonce%5D': `${ wpnonce }`,
+					'data%5Bwp_autosave%5D%5Bauto_draft%5D': '1',
+					'data%5Bwp_autosave%5D%5Bcatslist%5D': '',
+					'data%5Bwp_autosave%5D%5Bcomment_status%5D': 'open',
+					'data%5Bwp_autosave%5D%5Bcontent%5D': '',
+					'data%5Bwp_autosave%5D%5Bexcerpt%5D': '',
+					'data%5Bwp_autosave%5D%5Bpost_author%5D': '1',
+					'data%5Bwp_autosave%5D%5Bpost_id%5D': `${ post_id }`,
+					'data%5Bwp_autosave%5D%5Bpost_title%5D': `${ add_product_title }`,
+					'data%5Bwp_autosave%5D%5Bpost_type%5D': 'product',
+					has_focus: 'true',
+					interval: '15',
+					screen_id: 'product',
 				},
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - action=heartbeat autosave' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
-	} );
+	}
 
-	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	if ( includedTests.permalink ) {
+		group( 'Sample Permalink', function () {
+			const requestHeaders = Object.assign(
+				{},
+				commonNonStandardHeaders,
+				allRequestHeader,
+				contentTypeRequestHeader,
+				commonPostRequestHeaders
+			);
 
-	group( 'Autosave heartbeat', function () {
-		const requestHeaders = Object.assign(
-			{},
-			commonNonStandardHeaders,
-			jsonAPIRequestHeader,
-			commonPostRequestHeaders,
-			commonRequestHeaders
-		);
-
-		response = http.post(
-			`${ base_url }/wp-admin/admin-ajax.php`,
-			{
-				_nonce: `${ heartbeat_nonce }`,
-				action: 'heartbeat',
-				'data%5Bwp-refresh-post-lock%5D%5Bpost_id%5D': `${ post_id }`,
-				'data%5Bwp_autosave%5D%5B_wpnonce%5D': `${ wpnonce }`,
-				'data%5Bwp_autosave%5D%5Bauto_draft%5D': '1',
-				'data%5Bwp_autosave%5D%5Bcatslist%5D': '',
-				'data%5Bwp_autosave%5D%5Bcomment_status%5D': 'open',
-				'data%5Bwp_autosave%5D%5Bcontent%5D': '',
-				'data%5Bwp_autosave%5D%5Bexcerpt%5D': '',
-				'data%5Bwp_autosave%5D%5Bpost_author%5D': '1',
-				'data%5Bwp_autosave%5D%5Bpost_id%5D': `${ post_id }`,
-				'data%5Bwp_autosave%5D%5Bpost_title%5D': `${ add_product_title }`,
-				'data%5Bwp_autosave%5D%5Bpost_type%5D': 'product',
-				has_focus: 'true',
-				interval: '15',
-				screen_id: 'product',
-			},
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - action=heartbeat autosave' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+			response = http.post(
+				`${ base_url }/wp-admin/admin-ajax.php`,
+				{
+					action: 'sample-permalink',
+					new_title: `${ add_product_title }`,
+					post_id: `${ post_id }`,
+					samplepermalinknonce: `${ sample_permalink_nonce }`,
+				},
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - action=sample-permalink' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+				"body contains: 'Permalink:'": ( response ) =>
+					response.body.includes( '<strong>Permalink:</strong>' ),
+			} );
 		} );
-	} );
 
-	group( 'Sample Permalink', function () {
-		const requestHeaders = Object.assign(
-			{},
-			commonNonStandardHeaders,
-			allRequestHeader,
-			contentTypeRequestHeader,
-			commonPostRequestHeaders
-		);
+		sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	}
 
-		response = http.post(
-			`${ base_url }/wp-admin/admin-ajax.php`,
-			{
-				action: 'sample-permalink',
-				new_title: `${ add_product_title }`,
-				post_id: `${ post_id }`,
-				samplepermalinknonce: `${ sample_permalink_nonce }`,
-			},
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - action=sample-permalink' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-			"body contains: 'Permalink:'": ( response ) =>
-				response.body.includes( '<strong>Permalink:</strong>' ),
+	if ( includedTests.update ) {
+		group( 'Update New Product', function () {
+			const requestHeaders = Object.assign(
+				{},
+				htmlRequestHeader,
+				commonRequestHeaders,
+				commonGetRequestHeaders,
+				contentTypeRequestHeader,
+				commonNonStandardHeaders
+			);
+
+			const productParams = new URLSearchParams( [
+				[ '_ajax_nonce-add-meta', `${ ajax_nonce_add_meta }` ],
+				[
+					'_ajax_nonce-add-product_cat',
+					`${ ajax_nonce_add_product_cat }`,
+				],
+				[ '_backorders', 'no' ],
+				[ '_button_text', '' ],
+				[ '_download_expiry', '' ],
+				[ '_download_limit', '' ],
+				[ '_height', '' ],
+				[ '_length', '' ],
+				[ '_low_stock_amount', '' ],
+				[ '_original_stock', '0' ],
+				[ '_product_url', '' ],
+				[ '_purchase_note', '' ],
+				[ '_regular_price', `${ add_product_regular_price }` ],
+				[ '_sale_price', '' ],
+				[ '_sale_price_dates_from', '' ],
+				[ '_sale_price_dates_to', '' ],
+				[ '_sku', '' ],
+				[ '_stock', '0' ],
+				[ '_stock_status', 'instock' ],
+				[ '_thumbnail_id', '-1' ],
+				[ '_visibility', 'visible' ],
+				[ '_weight', '' ],
+				[ '_width', '' ],
+				[ '_wp_http_referer', '' ],
+				[ '_wp_original_http_referer', '' ],
+				[ '_wpnonce', `${ wpnonce }` ],
+				[ 'aa', '2021' ],
+				[ 'action', 'editpost' ],
+				[ 'attribute_taxonomy', '' ],
+				[ 'auto_draft', '' ],
+				[ 'closedpostboxesnonce', `${ closed_postboxes_nonce }` ],
+				[ 'comment_status', 'open' ],
+				[ 'content', '' ],
+				[ 'cur_aa', '2021' ],
+				[ 'cur_hh', '15' ],
+				[ 'cur_jj', '09' ],
+				[ 'cur_mm', '07' ],
+				[ 'cur_mn', '48' ],
+				[ 'current_featured', 'no' ],
+				[ 'current_visibility', 'visible' ],
+				[ 'excerpt', '' ],
+				[ 'hh', '15' ],
+				[ 'hidden_aa', '2021' ],
+				[ 'hidden_hh', '15' ],
+				[ 'hidden_jj', '09' ],
+				[ 'hidden_mm', '07' ],
+				[ 'hidden_mn', '48' ],
+				[ 'hidden_post_password', '' ],
+				[ 'hidden_post_status', 'draft' ],
+				[ 'hidden_post_visibility', 'public' ],
+				[ 'jj', '09' ],
+				[ 'menu_order', '0' ],
+				[ 'meta-box-order-nonce', `${ meta_box_order_nonce }` ],
+				[ 'metakeyinput', '' ],
+				[ 'metakeyselect', '%2523NONE%2523' ],
+				[ 'metavalue', '' ],
+				[ 'mm', '07' ],
+				[ 'mn', '48' ],
+				[ 'newproduct_cat', 'New%2520category%2520name' ],
+				[ 'newproduct_cat_parent', '-1' ],
+				[ 'newtag%255Bproduct_tag%255D', '' ],
+				[ 'original_post_status', 'auto-draft' ],
+				[ 'original_post_title', '' ],
+				[ 'original_publish', 'Publish' ],
+				[ 'originalaction', 'editpost' ],
+				[ 'post_ID', `${ post_id }` ],
+				[ 'post_author', '1' ],
+				[ 'post_name', '' ],
+				[ 'post_password', '' ],
+				[ 'post_status', 'draft' ],
+				[ 'post_title', `${ add_product_title }` ],
+				[ 'post_type', 'product' ],
+				[ 'product-type', 'simple' ],
+				[ 'product_image_gallery', '' ],
+				[ 'product_shipping_class', '-1' ],
+				[ 'publish', 'Publish' ],
+				[ 'referredby', '' ],
+				[ 'samplepermalinknonce', `${ sample_permalink_nonce }` ],
+				[ 'ss', '12' ],
+				[ 'tax_input%255Bproduct_cat%255D%255B%255D', '0' ],
+				[ 'tax_input%255Bproduct_tag%255D', '' ],
+				[ 'user_ID', '1' ],
+				[ 'visibility', 'public' ],
+				[ 'woocommerce_meta_nonce', `${ woocommerce_meta_nonce }` ],
+				[ 'wp-preview', '' ],
+			] );
+
+			response = http.post(
+				`${ base_url }/wp-admin/post.php`,
+				productParams.toString(),
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - Update New Product' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+				"body contains: 'Edit product' header": ( response ) =>
+					response.body.includes( 'Edit product</h1>' ),
+				"body contains: 'Product published' confirmation": ( response ) =>
+					response.body.includes( 'Product published.' ),
+			} );
 		} );
-	} );
-
-	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
-
-	group( 'Update New Product', function () {
-		const requestHeaders = Object.assign(
-			{},
-			htmlRequestHeader,
-			commonRequestHeaders,
-			commonGetRequestHeaders,
-			contentTypeRequestHeader,
-			commonNonStandardHeaders
-		);
-
-		const productParams = new URLSearchParams( [
-			[ '_ajax_nonce-add-meta', `${ ajax_nonce_add_meta }` ],
-			[
-				'_ajax_nonce-add-product_cat',
-				`${ ajax_nonce_add_product_cat }`,
-			],
-			[ '_backorders', 'no' ],
-			[ '_button_text', '' ],
-			[ '_download_expiry', '' ],
-			[ '_download_limit', '' ],
-			[ '_height', '' ],
-			[ '_length', '' ],
-			[ '_low_stock_amount', '' ],
-			[ '_original_stock', '0' ],
-			[ '_product_url', '' ],
-			[ '_purchase_note', '' ],
-			[ '_regular_price', `${ add_product_regular_price }` ],
-			[ '_sale_price', '' ],
-			[ '_sale_price_dates_from', '' ],
-			[ '_sale_price_dates_to', '' ],
-			[ '_sku', '' ],
-			[ '_stock', '0' ],
-			[ '_stock_status', 'instock' ],
-			[ '_thumbnail_id', '-1' ],
-			[ '_visibility', 'visible' ],
-			[ '_weight', '' ],
-			[ '_width', '' ],
-			[ '_wp_http_referer', '' ],
-			[ '_wp_original_http_referer', '' ],
-			[ '_wpnonce', `${ wpnonce }` ],
-			[ 'aa', '2021' ],
-			[ 'action', 'editpost' ],
-			[ 'attribute_taxonomy', '' ],
-			[ 'auto_draft', '' ],
-			[ 'closedpostboxesnonce', `${ closed_postboxes_nonce }` ],
-			[ 'comment_status', 'open' ],
-			[ 'content', '' ],
-			[ 'cur_aa', '2021' ],
-			[ 'cur_hh', '15' ],
-			[ 'cur_jj', '09' ],
-			[ 'cur_mm', '07' ],
-			[ 'cur_mn', '48' ],
-			[ 'current_featured', 'no' ],
-			[ 'current_visibility', 'visible' ],
-			[ 'excerpt', '' ],
-			[ 'hh', '15' ],
-			[ 'hidden_aa', '2021' ],
-			[ 'hidden_hh', '15' ],
-			[ 'hidden_jj', '09' ],
-			[ 'hidden_mm', '07' ],
-			[ 'hidden_mn', '48' ],
-			[ 'hidden_post_password', '' ],
-			[ 'hidden_post_status', 'draft' ],
-			[ 'hidden_post_visibility', 'public' ],
-			[ 'jj', '09' ],
-			[ 'menu_order', '0' ],
-			[ 'meta-box-order-nonce', `${ meta_box_order_nonce }` ],
-			[ 'metakeyinput', '' ],
-			[ 'metakeyselect', '%2523NONE%2523' ],
-			[ 'metavalue', '' ],
-			[ 'mm', '07' ],
-			[ 'mn', '48' ],
-			[ 'newproduct_cat', 'New%2520category%2520name' ],
-			[ 'newproduct_cat_parent', '-1' ],
-			[ 'newtag%255Bproduct_tag%255D', '' ],
-			[ 'original_post_status', 'auto-draft' ],
-			[ 'original_post_title', '' ],
-			[ 'original_publish', 'Publish' ],
-			[ 'originalaction', 'editpost' ],
-			[ 'post_ID', `${ post_id }` ],
-			[ 'post_author', '1' ],
-			[ 'post_name', '' ],
-			[ 'post_password', '' ],
-			[ 'post_status', 'draft' ],
-			[ 'post_title', `${ add_product_title }` ],
-			[ 'post_type', 'product' ],
-			[ 'product-type', 'simple' ],
-			[ 'product_image_gallery', '' ],
-			[ 'product_shipping_class', '-1' ],
-			[ 'publish', 'Publish' ],
-			[ 'referredby', '' ],
-			[ 'samplepermalinknonce', `${ sample_permalink_nonce }` ],
-			[ 'ss', '12' ],
-			[ 'tax_input%255Bproduct_cat%255D%255B%255D', '0' ],
-			[ 'tax_input%255Bproduct_tag%255D', '' ],
-			[ 'user_ID', '1' ],
-			[ 'visibility', 'public' ],
-			[ 'woocommerce_meta_nonce', `${ woocommerce_meta_nonce }` ],
-			[ 'wp-preview', '' ],
-		] );
-
-		response = http.post(
-			`${ base_url }/wp-admin/post.php`,
-			productParams.toString(),
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - Update New Product' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-			"body contains: 'Edit product' header": ( response ) =>
-				response.body.includes( 'Edit product</h1>' ),
-			"body contains: 'Product published' confirmation": ( response ) =>
-				response.body.includes( 'Product published.' ),
-		} );
-	} );
+	}
 
 	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
 }
diff --git a/plugins/woocommerce/tests/performance/requests/merchant/home-wc-admin.js b/plugins/woocommerce/tests/performance/requests/merchant/home-wc-admin.js
index a488e8a8153..1cf8bbb6d98 100644
--- a/plugins/woocommerce/tests/performance/requests/merchant/home-wc-admin.js
+++ b/plugins/woocommerce/tests/performance/requests/merchant/home-wc-admin.js
@@ -23,10 +23,18 @@ import {
 	commonNonStandardHeaders,
 } from '../../headers.js';
 
-export function homeWCAdmin() {
+export function homeWCAdmin( includeTests = {} ) {
 	let response;
 	let api_x_wp_nonce;
 	let apiNonceHeader;
+	let includedTests = Object.assign( {
+			orders: true,
+			other: true,
+			products: true,
+			reviews: true,
+		},
+		includeTests
+	);
 
 	group( 'WC Home Page', function () {
 		const requestHeaders = Object.assign(
@@ -62,123 +70,131 @@ export function homeWCAdmin() {
 
 	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
 
-	group( 'WC Admin - Other Requests', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonAPIRequestHeader,
-			commonRequestHeaders,
-			commonAPIGetRequestHeaders,
-			apiNonceHeader,
-			commonNonStandardHeaders
-		);
+	if ( includedTests.other ) {
+		group( 'WC Admin - Other Requests', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonAPIRequestHeader,
+				commonRequestHeaders,
+				commonAPIGetRequestHeaders,
+				apiNonceHeader,
+				commonNonStandardHeaders
+			);
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
+					`type=error%2Cupdate&status=unactioned&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-analytics/admin/notes?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: {
+						name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
+					},
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
+	}
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
-				`type=error%2Cupdate&status=unactioned&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-analytics/admin/notes?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+	if ( includedTests.orders ) {
+		group( 'Orders Activity', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonAPIRequestHeader,
+				commonRequestHeaders,
+				commonAPIGetRequestHeaders,
+				apiNonceHeader,
+				commonNonStandardHeaders
+			);
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-analytics/orders?page=1&per_page=1&status%5B0%5D=processing&` +
+					`status%5B1%5D=on-hold&_fields%5B0%5D=id&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-analytics/orders?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
+	}
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: {
-					name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
-				},
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+	if ( includedTests.reviews ) {
+		group( 'Reviews Activity', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonAPIRequestHeader,
+				commonRequestHeaders,
+				commonAPIGetRequestHeaders,
+				apiNonceHeader,
+				commonNonStandardHeaders
+			);
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-analytics/products/reviews?page=1&per_page=1&status=hold&` +
+					`_embed=1&_fields%5B0%5D=id&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-analytics/products/reviews?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
-	} );
+	}
 
-	group( 'Orders Activity', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonAPIRequestHeader,
-			commonRequestHeaders,
-			commonAPIGetRequestHeaders,
-			apiNonceHeader,
-			commonNonStandardHeaders
-		);
+	if ( includedTests.products ) {
+		group( 'Products Activity', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonAPIRequestHeader,
+				commonRequestHeaders,
+				commonAPIGetRequestHeaders,
+				apiNonceHeader,
+				commonNonStandardHeaders
+			);
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-analytics/orders?page=1&per_page=1&status%5B0%5D=processing&` +
-				`status%5B1%5D=on-hold&_fields%5B0%5D=id&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-analytics/orders?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+			response = http.get(
+				`${ base_url }/wp-json/wc-analytics/products/low-in-stock?page=1&per_page=1&` +
+					`low_in_stock=true&status=publish&_fields%5B0%5D=id&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: {
+						name: 'Merchant - wc-analytics/products/low-in-stock?',
+					},
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
-	} );
-
-	group( 'Reviews Activity', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonAPIRequestHeader,
-			commonRequestHeaders,
-			commonAPIGetRequestHeaders,
-			apiNonceHeader,
-			commonNonStandardHeaders
-		);
-
-		response = http.get(
-			`${ base_url }/wp-json/wc-analytics/products/reviews?page=1&per_page=1&status=hold&` +
-				`_embed=1&_fields%5B0%5D=id&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-analytics/products/reviews?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-		} );
-	} );
-
-	group( 'Products Activity', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonAPIRequestHeader,
-			commonRequestHeaders,
-			commonAPIGetRequestHeaders,
-			apiNonceHeader,
-			commonNonStandardHeaders
-		);
-
-		response = http.get(
-			`${ base_url }/wp-json/wc-analytics/products/low-in-stock?page=1&per_page=1&` +
-				`low_in_stock=true&status=publish&_fields%5B0%5D=id&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: {
-					name: 'Merchant - wc-analytics/products/low-in-stock?',
-				},
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-		} );
-	} );
+	}
 
 	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
 }
diff --git a/plugins/woocommerce/tests/performance/requests/merchant/orders.js b/plugins/woocommerce/tests/performance/requests/merchant/orders.js
index 375e831aeba..bf763ce9c6c 100644
--- a/plugins/woocommerce/tests/performance/requests/merchant/orders.js
+++ b/plugins/woocommerce/tests/performance/requests/merchant/orders.js
@@ -44,11 +44,18 @@ if ( cot_status === true ) {
 	admin_orders_completed = 'post_status=wc-completed';
 }
 
-export function orders() {
+export function orders( includeTests = {} ) {
 	let response;
 	let api_x_wp_nonce;
 	let apiNonceHeader;
 	let heartbeat_nonce;
+	let includedTests = Object.assign( {
+			completed: true,
+			heartbeat: true,
+			other: true,
+		},
+		includeTests
+	);
 
 	group( 'All Orders', function () {
 		const requestHeaders = Object.assign(
@@ -89,102 +96,108 @@ export function orders() {
 
 	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
 
-	group( 'All Orders - Other Requests', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonAPIRequestHeader,
-			commonRequestHeaders,
-			commonAPIGetRequestHeaders,
-			apiNonceHeader,
-			commonNonStandardHeaders
-		);
+	if ( includedTests.other ) {
+		group( 'All Orders - Other Requests', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonAPIRequestHeader,
+				commonRequestHeaders,
+				commonAPIGetRequestHeaders,
+				apiNonceHeader,
+				commonNonStandardHeaders
+			);
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/onboarding/tasks?_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-admin/onboarding/tasks?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
+					`type=error%2Cupdate&status=unactioned&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - wc-analytics/admin/notes?' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+
+			response = http.get(
+				`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
+				{
+					headers: requestHeaders,
+					tags: {
+						name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
+					},
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
+		} );
+	}
+
+	if ( includedTests.heartbeat ) {
+		group( 'WP Admin Heartbeat', function () {
+			const requestHeaders = Object.assign(
+				{},
+				jsonRequestHeader,
+				commonRequestHeaders,
+				contentTypeRequestHeader,
+				commonPostRequestHeaders,
+				commonNonStandardHeaders
+			);
+
+			response = http.post(
+				`${ base_url }/wp-admin/admin-ajax.php`,
+				`_nonce=${ heartbeat_nonce }&action=heartbeat&has_focus=true&interval=15&screen_id=shop_order`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - action=heartbeat' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+			} );
 		} );
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-analytics/admin/notes?page=1&per_page=25&` +
-				`type=error%2Cupdate&status=unactioned&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - wc-analytics/admin/notes?' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
+		sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	}
+
+	if ( includedTests.completed ) {
+		group( 'Completed Orders', function () {
+			const requestHeaders = Object.assign(
+				{},
+				htmlRequestHeader,
+				commonRequestHeaders,
+				commonGetRequestHeaders,
+				commonNonStandardHeaders
+			);
+
+			response = http.get(
+				`${ base_url }/wp-admin/${ admin_orders_base }&${ admin_orders_completed }`,
+				{
+					headers: requestHeaders,
+					tags: { name: 'Merchant - Completed Orders' },
+				}
+			);
+			check( response, {
+				'is status 200': ( r ) => r.status === 200,
+				"body contains: 'Orders' header": ( response ) =>
+					response.body.includes( 'Orders</h1>' ),
+			} );
 		} );
 
-		response = http.get(
-			`${ base_url }/wp-json/wc-admin/options?options=woocommerce_ces_tracks_queue&_locale=user`,
-			{
-				headers: requestHeaders,
-				tags: {
-					name: 'Merchant - wc-admin/options?options=woocommerce_ces_tracks_queue',
-				},
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-		} );
-	} );
-
-	group( 'WP Admin Heartbeat', function () {
-		const requestHeaders = Object.assign(
-			{},
-			jsonRequestHeader,
-			commonRequestHeaders,
-			contentTypeRequestHeader,
-			commonPostRequestHeaders,
-			commonNonStandardHeaders
-		);
-
-		response = http.post(
-			`${ base_url }/wp-admin/admin-ajax.php`,
-			`_nonce=${ heartbeat_nonce }&action=heartbeat&has_focus=true&interval=15&screen_id=shop_order`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - action=heartbeat' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-		} );
-	} );
-
-	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
-
-	group( 'Completed Orders', function () {
-		const requestHeaders = Object.assign(
-			{},
-			htmlRequestHeader,
-			commonRequestHeaders,
-			commonGetRequestHeaders,
-			commonNonStandardHeaders
-		);
-
-		response = http.get(
-			`${ base_url }/wp-admin/${ admin_orders_base }&${ admin_orders_completed }`,
-			{
-				headers: requestHeaders,
-				tags: { name: 'Merchant - Completed Orders' },
-			}
-		);
-		check( response, {
-			'is status 200': ( r ) => r.status === 200,
-			"body contains: 'Orders' header": ( response ) =>
-				response.body.includes( 'Orders</h1>' ),
-		} );
-	} );
-
-	sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+		sleep( randomIntBetween( `${ think_time_min }`, `${ think_time_max }` ) );
+	}
 }
 
 export default function () {
diff --git a/plugins/woocommerce/tests/performance/tests/hpos-baseline-load.js b/plugins/woocommerce/tests/performance/tests/hpos-baseline-load.js
new file mode 100644
index 00000000000..17a937d903b
--- /dev/null
+++ b/plugins/woocommerce/tests/performance/tests/hpos-baseline-load.js
@@ -0,0 +1,303 @@
+/* eslint-disable eqeqeq */
+/* eslint-disable no-undef */
+/**
+ * Internal dependencies
+ */
+import { homePage } from '../requests/shopper/home.js';
+import { shopPage } from '../requests/shopper/shop-page.js';
+import { searchProduct } from '../requests/shopper/search-product.js';
+import { singleProduct } from '../requests/shopper/single-product.js';
+import { cart } from '../requests/shopper/cart.js';
+import { cartRemoveItem } from '../requests/shopper/cart-remove-item.js';
+import { cartApplyCoupon } from '../requests/shopper/cart-apply-coupon.js';
+import { checkoutGuest } from '../requests/shopper/checkout-guest.js';
+import { checkoutCustomerLogin } from '../requests/shopper/checkout-customer-login.js';
+import { myAccountOrders } from '../requests/shopper/my-account-orders.js';
+import { categoryPage } from '../requests/shopper/category-page.js';
+import { coupons } from '../requests/merchant/coupons.js';
+import { addProduct } from '../requests/merchant/add-product.js';
+import { orders } from '../requests/merchant/orders.js';
+import { ordersSearch } from '../requests/merchant/orders-search.js';
+import { ordersFilter } from '../requests/merchant/orders-filter.js';
+import { addOrder } from '../requests/merchant/add-order.js';
+import { homeWCAdmin } from '../requests/merchant/home-wc-admin.js';
+import { myAccountMerchantLogin } from '../requests/merchant/my-account-merchant.js';
+import { wpLogin } from '../requests/merchant/wp-login.js';
+import { ordersAPI } from '../requests/api/orders.js';
+import { admin_acc_login } from '../config.js';
+
+const shopper_request_threshold = 'p(95)<100000';
+const merchant_request_threshold = 'p(95)<100000';
+const api_request_threshold = 'p(95)<100000';
+
+export const options = {
+	scenarios: {
+		merchantOrders: {
+			executor: 'ramping-arrival-rate',
+			startRate: 2, // starting iterations per timeUnit
+			timeUnit: '10s',
+			preAllocatedVUs: 5,
+			maxVUs: 9,
+			stages: [
+				// target value is iterations per timeUnit
+				{ target: 2, duration: '60s' },
+				{ target: 5, duration: '500s' },
+				{ target: 1, duration: '60' },
+			],
+			exec: 'merchantOrderFlows',
+		},
+		merchantOther: {
+			executor: 'ramping-arrival-rate',
+			startRate: 2, // starting iterations per timeUnit
+			timeUnit: '10s',
+			preAllocatedVUs: 5,
+			maxVUs: 9,
+			stages: [
+				// target value is iterations per timeUnit
+				{ target: 2, duration: '60s' },
+				{ target: 5, duration: '500s' },
+				{ target: 1, duration: '60' },
+			],
+			exec: 'merchantOtherFlows',
+		},
+		shopperBrowsing: {
+			executor: 'ramping-arrival-rate',
+			startRate: 2, // starting iterations per timeUnit
+			timeUnit: '10s',
+			preAllocatedVUs: 5,
+			maxVUs: 9,
+			stages: [
+				// target value is iterations per timeUnit
+				{ target: 2, duration: '60s' },
+				{ target: 10, duration: '500s' },
+				{ target: 1, duration: '60' },
+			],
+			exec: 'shopperBrowsingFlows',
+		},
+		shopperGuestCheckouts: {
+			executor: 'ramping-arrival-rate',
+			startRate: 2, // starting iterations per timeUnit
+			timeUnit: '10s',
+			preAllocatedVUs: 5,
+			maxVUs: 9,
+			stages: [
+				// target value is iterations per timeUnit
+				{ target: 2, duration: '60s' },
+				{ target: 5, duration: '500s' },
+				{ target: 1, duration: '60' },
+			],
+			exec: 'checkoutGuestFlow',
+		},
+		shopperCustomerCheckouts: {
+			executor: 'ramping-arrival-rate',
+			startRate: 2, // starting iterations per timeUnit
+			timeUnit: '10s',
+			preAllocatedVUs: 5,
+			maxVUs: 9,
+			stages: [
+				// target value is iterations per timeUnit
+				{ target: 2, duration: '60s' },
+				{ target: 5, duration: '500s' },
+				{ target: 1, duration: '60' },
+			],
+			exec: 'checkoutCustomerLoginFlow',
+		},
+		apiBackground: {
+			executor: 'ramping-arrival-rate',
+			startRate: 1, // starting iterations per timeUnit
+			timeUnit: '10s',
+			preAllocatedVUs: 5,
+			maxVUs: 5,
+			stages: [
+				// target value is iterations per timeUnit
+				{ target: 1, duration: '60s' },
+				{ target: 5, duration: '500s' },
+				{ target: 1, duration: '60' },
+			],
+			exec: 'allAPIFlow',
+		},
+	},
+	thresholds: {
+		// Listing individual metrics due to https://github.com/grafana/k6/issues/1321
+		'http_req_duration{name:Shopper - Site Root}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Shop Page}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Search Products}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Category Page}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Product Page}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - wc-ajax=add_to_cart}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - View Cart}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Remove Item From Cart}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - wc-ajax=apply_coupon}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Update Cart}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - View Checkout}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - wc-ajax=update_order_review}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - wc-ajax=checkout}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Order Received}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - wc-ajax=get_refreshed_fragments}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Login to Checkout}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - My Account Login Page}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - Login to My Account}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - My Account}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - My Account Orders}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Shopper - My Account Open Order}': [
+			`${ shopper_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - WP Login Page}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Login to WP Admin}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - WC-Admin}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - wc-analytics/orders?}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - All Orders}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Completed Orders}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - New Order Page}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Create New Order}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Open Order}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Update Existing Order Status}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Search Orders By Product}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Search Orders By Customer Email}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Search Orders By Customer Address}':
+			[ `${ merchant_request_threshold }` ],
+		'http_req_duration{name:Merchant - Filter Orders By Month}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Filter Orders By Customer}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - All Products}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Add New Product}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:Merchant - Update New Product}': [
+			`${ merchant_request_threshold }`,
+		],
+		'http_req_duration{name:API - Create Order}': [
+			`${ api_request_threshold }`,
+		],
+		'http_req_duration{name:API - Retrieve Order}': [
+			`${ api_request_threshold }`,
+		],
+		'http_req_duration{name:API - Update Order (Status)}': [
+			`${ api_request_threshold }`,
+		],
+		'http_req_duration{name:API - Delete Order}': [
+			`${ api_request_threshold }`,
+		],
+		'http_req_duration{name:API - Batch Create Orders}': [
+			`${ api_request_threshold }`,
+		],
+		'http_req_duration{name:API - Batch Update (Status) Orders}': [
+			`${ api_request_threshold }`,
+		],
+	},
+};
+
+// Use myAccountMerchantLogin() instead of wpLogin() if having issues with login.
+export function merchantOrderFlows() {
+	if ( admin_acc_login === true ) {
+		myAccountMerchantLogin();
+	} else {
+		wpLogin();
+	}
+	addOrder( { heartbeat: false, other: false } );
+	orders( { heartbeat: false, other: false } );
+	ordersSearch();
+	ordersFilter();
+}
+
+// Use myAccountMerchantLogin() instead of wpLogin() if having issues with login.
+export function merchantOtherFlows() {
+	if ( admin_acc_login === true ) {
+		myAccountMerchantLogin();
+	} else {
+		wpLogin();
+	}
+	homeWCAdmin( { other: false, products: false, reviews: false } );
+	addProduct( { heartbeat: false, other: false, permalink: false, update: false } );
+	coupons();
+}
+export function shopperBrowsingFlows() {
+	homePage();
+	shopPage();
+	searchProduct();
+	singleProduct();
+	cartRemoveItem();
+	cartApplyCoupon();
+	categoryPage();
+}
+export function checkoutGuestFlow() {
+	cart();
+	checkoutGuest();
+}
+export function checkoutCustomerLoginFlow() {
+	cart();
+	checkoutCustomerLogin();
+	myAccountOrders();
+}
+export function allAPIFlow() {
+	ordersAPI();
+}
diff --git a/plugins/woocommerce/tests/php/includes/admin/class-wc-admin-functions-test.php b/plugins/woocommerce/tests/php/includes/admin/class-wc-admin-functions-test.php
index eb194b0cc39..f90fe936abc 100644
--- a/plugins/woocommerce/tests/php/includes/admin/class-wc-admin-functions-test.php
+++ b/plugins/woocommerce/tests/php/includes/admin/class-wc-admin-functions-test.php
@@ -283,7 +283,7 @@ class WC_Admin_Functions_Test extends \WC_Unit_Test_Case {
 
 		$product = wc_get_product( $product->get_id() );
 
-		// Stocks should have been increased to orignal amount minus the partially refunded stock.
+		// Stocks should have been increased to original amount minus the partially refunded stock.
 		$this->assertEquals( 95, $product->get_stock_quantity() );
 	}
 
diff --git a/plugins/woocommerce/tests/php/includes/admin/helper/class-wc-helper-test.php b/plugins/woocommerce/tests/php/includes/admin/helper/class-wc-helper-test.php
index 7d591a49e60..a59e088cca6 100644
--- a/plugins/woocommerce/tests/php/includes/admin/helper/class-wc-helper-test.php
+++ b/plugins/woocommerce/tests/php/includes/admin/helper/class-wc-helper-test.php
@@ -6,7 +6,7 @@
 class WC_Helper_Test extends \WC_Unit_Test_Case {
 
 	/**
-	 * Test that woo plugins are loaded correctly even if incorrect cache is intially set.
+	 * Test that woo plugins are loaded correctly even if incorrect cache is initially set.
 	 */
 	public function test_get_local_woo_plugins_without_woo_header_cache() {
 		$woocommerce_key = 'sample-woo-plugin.php';
diff --git a/plugins/woocommerce/tests/php/includes/class-wc-install-test.php b/plugins/woocommerce/tests/php/includes/class-wc-install-test.php
index 0afda1bbea1..3ae13770efc 100644
--- a/plugins/woocommerce/tests/php/includes/class-wc-install-test.php
+++ b/plugins/woocommerce/tests/php/includes/class-wc-install-test.php
@@ -1,5 +1,7 @@
 <?php
 
+use Automattic\WooCommerce\Admin\Notes\Note;
+
 /**
  * Class WC_Install_Test.
  */
@@ -105,4 +107,61 @@ class WC_Install_Test extends \WC_Unit_Test_Case {
 		$this->assertEmpty( $db_delta_result );
 	}
 
+	/**
+	 * Test that delete_obsolete_notes deletes notes.
+	 */
+	public function test_delete_obsolete_notes_deletes_notes() {
+		$data_store = \WC_Data_Store::load( 'admin-note' );
+
+		$note_name = 'wc-admin-welcome-note';
+
+		$note = new Note();
+		$note->set_name( $note_name );
+		$note->set_status( Note::E_WC_ADMIN_NOTE_UNACTIONED );
+		$note->add_action( 'test-action', 'Primary Action', 'https://example.com', Note::E_WC_ADMIN_NOTE_UNACTIONED, true );
+		$note->add_action( 'test-action-2', 'Action 2', 'https://example.com' );
+		$data_store->create( $note );
+
+		$this->assertEquals( 1, count( $data_store->get_notes_with_name( $note_name ) ) );
+
+		WC_Install::delete_obsolete_notes();
+
+		$this->assertEmpty( $data_store->get_notes_with_name( $note_name ) );
+
+	}
+
+	/**
+	 * Test that delete_obsolete_notes doesn't delete other notes.
+	 */
+	public function test_delete_obsolete_notes_deletes_only_selected_notes() {
+		$data_store = \WC_Data_Store::load( 'admin-note' );
+
+		$note_name = 'wc-admin-welcome-note';
+
+		$note = new Note();
+		$note->set_name( $note_name );
+		$note->set_status( Note::E_WC_ADMIN_NOTE_UNACTIONED );
+		$note->add_action( 'test-action', 'Primary Action', 'https://example.com', Note::E_WC_ADMIN_NOTE_UNACTIONED, true );
+		$note->add_action( 'test-action-2', 'Action 2', 'https://example.com' );
+		$data_store->create( $note );
+
+		$note_name_2 = 'wc-admin-welcome-note-from-the-queen';
+
+		$note_2 = new Note();
+		$note_2->set_name( $note_name_2 );
+		$note_2->set_status( Note::E_WC_ADMIN_NOTE_UNACTIONED );
+		$note_2->add_action( 'test-action', 'Primary Action', 'https://example.com', Note::E_WC_ADMIN_NOTE_UNACTIONED, true );
+		$note_2->add_action( 'test-action-2', 'Action 2', 'https://example.com' );
+		$data_store->create( $note_2 );
+
+		$this->assertEquals( '2', $data_store->get_notes_count( array( Note::E_WC_ADMIN_NOTE_INFORMATIONAL ), array() ) );
+
+		WC_Install::delete_obsolete_notes();
+
+		$this->assertEmpty( $data_store->get_notes_with_name( $note_name ) );
+		$this->assertEquals( '1', $data_store->get_notes_count( array( Note::E_WC_ADMIN_NOTE_INFORMATIONAL ), array() ) );
+
+		$data_store->delete( $note_2 );
+	}
+
 }
diff --git a/plugins/woocommerce/tests/php/includes/class-wc-webhook-tests.php b/plugins/woocommerce/tests/php/includes/class-wc-webhook-tests.php
index a17b544d1fb..f1f51120993 100644
--- a/plugins/woocommerce/tests/php/includes/class-wc-webhook-tests.php
+++ b/plugins/woocommerce/tests/php/includes/class-wc-webhook-tests.php
@@ -34,4 +34,82 @@ class WC_Webhook_Test extends WC_Unit_Test_Case {
 		$this->assertFalse( $call_is_valid_function->call( $webhook, $product->get_id() ) );
 	}
 
+	/**
+	 * @testDox Check that a deleted administrator user (with content re-assigned to another user)
+	 * does not cause webhook payloads to fail.
+	 */
+	public function test_payload_for_deleted_user_id_with_reassign() {
+		$admin_user_id_1 = wp_insert_user(
+			array(
+				'user_login' => 'test_admin',
+				'user_pass'  => 'password',
+				'role'       => 'administrator',
+			)
+		);
+
+		$webhook = new WC_Webhook();
+		$webhook->set_topic( 'order.created' );
+		$webhook->set_user_id( $admin_user_id_1 );
+		$webhook->save();
+
+		$order = \Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper::create_order();
+
+		$payload = $webhook->build_payload( $order->get_id() );
+		$this->assertArrayNotHasKey( 'code', $payload );
+		$this->assertArrayHasKey( 'id', $payload );
+		$this->assertSame( $order->get_id(), $payload['id'] );
+
+		// Create a second admin user and delete the first one, reassigning existing content to the second user.
+		$admin_user_id_2 = wp_insert_user(
+			array(
+				'user_login' => 'test_admin2',
+				'user_pass'  => 'password',
+				'role'       => 'administrator',
+			)
+		);
+		wp_delete_user( $admin_user_id_1, $admin_user_id_2 );
+
+		// Re-load the webhook from the database.
+		$webhook = new WC_Webhook( $webhook->get_id() );
+		// Confirm user_id has been updated to the second admin user.
+		$this->assertSame( $admin_user_id_2, $webhook->get_user_id() );
+
+		$this->assertArrayNotHasKey( 'code', $payload );
+		$this->assertArrayHasKey( 'id', $payload );
+		$this->assertSame( $order->get_id(), $payload['id'] );
+	}
+
+	/**
+	 * @testDox Check that a deleted administrator user (without content re-assigned to another user)
+	 * has all webhooks changed to user_id zero.
+	 */
+	public function test_payload_for_deleted_user_id_without_reassign() {
+		$admin_user_id = wp_insert_user(
+			array(
+				'user_login' => 'test_admin',
+				'user_pass'  => 'password',
+				'role'       => 'administrator',
+			)
+		);
+
+		$webhook1 = new WC_Webhook();
+		$webhook1->set_topic( 'order.created' );
+		$webhook1->set_user_id( $admin_user_id );
+		$webhook1->save();
+
+		$webhook2 = new WC_Webhook();
+		$webhook2->set_topic( 'order.created' );
+		$webhook2->set_user_id( 999 );
+		$webhook2->save();
+
+		wp_delete_user( $admin_user_id );
+
+		// Re-load the webhooks from the database.
+		$webhook1 = new WC_Webhook( $webhook1->get_id() );
+		$webhook2 = new WC_Webhook( $webhook2->get_id() );
+		// Confirm user_id has been updated to zero for the first webhook only.
+		$this->assertSame( 0, $webhook1->get_user_id() );
+		$this->assertSame( 999, $webhook2->get_user_id() );
+	}
+
 }
diff --git a/plugins/woocommerce/tests/php/includes/data-stores/class-wc-webhook-data-store-test.php b/plugins/woocommerce/tests/php/includes/data-stores/class-wc-webhook-data-store-test.php
new file mode 100644
index 00000000000..92b736cc42b
--- /dev/null
+++ b/plugins/woocommerce/tests/php/includes/data-stores/class-wc-webhook-data-store-test.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Tests relating to the WC_Webhook_Data_Store class.
+ */
+class WC_Webhook_Data_Store_Test extends WC_Unit_Test_Case {
+
+	/**
+	 * Verify that the search_webhooks() method returns the correct results when searching by user ID.
+	 */
+	public function test_search_webhooks_by_user_id() {
+
+		$store = new WC_Webhook_Data_Store();
+
+		$this->assertEmpty(
+			$store->search_webhooks(
+				array(
+					'user_id' => 1,
+				)
+			)
+		);
+
+		$webhook1 = new WC_Webhook();
+		$webhook1->set_user_id( 1 );
+		$webhook1->save();
+
+		$webhook2 = new WC_Webhook();
+		$webhook2->set_user_id( 2 );
+		$webhook2->save();
+
+		$this->assertSame(
+			array( $webhook1->get_id() ),
+			$store->search_webhooks(
+				array(
+					'user_id' => 1,
+				)
+			)
+		);
+		$this->assertSame(
+			array( $webhook2->get_id() ),
+			$store->search_webhooks(
+				array(
+					'user_id' => 2,
+				)
+			)
+		);
+	}
+
+}
diff --git a/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller-tests.php b/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller-tests.php
index 71569ba483b..c4419b92499 100644
--- a/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller-tests.php
+++ b/plugins/woocommerce/tests/php/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller-tests.php
@@ -204,84 +204,6 @@ class WC_REST_Products_Controller_Tests extends WC_REST_Unit_Test_Case {
 		}
 	}
 
-	/**
-	 * Test that featured field exists under images in product argument.
-	 */
-	public function test_products_args_includes_featured_field() {
-		$request = new WP_REST_Request( 'OPTIONS', '/wc/v3/products' );
-		$request->set_param( '_fields', 'endpoints.1.args.images.items.properties' );
-		$response  = $this->server->dispatch( $request );
-		$image_arg = $response->get_data()['endpoints'][1]['args']['images']['items']['properties'];
-		$this->assertArrayHasKey( 'featured', $image_arg );
-		$this->assertEquals(
-			array(
-				'description' => 'Featured image.',
-				'type'        => 'boolean',
-				'default'     => false,
-				'context'     =>
-				array(
-					0 => 'view',
-					1 => 'edit',
-				),
-			),
-			$image_arg['featured']
-		);
-	}
-
-	/**
-	 * Test that featured field exists under images in product schema.
-	 */
-	public function test_products_schema_includes_featured_field() {
-		$request = new WP_REST_Request( 'OPTIONS', '/wc/v3/products' );
-		$request->set_param( '_fields', 'schema.properties.images.items.properties' );
-		$response     = $this->server->dispatch( $request );
-		$image_schema = $response->get_data()['schema']['properties']['images']['items']['properties'];
-		$this->assertArrayHasKey( 'featured', $image_schema );
-		$this->assertEquals(
-			array(
-				'description' => 'Featured image.',
-				'type'        => 'boolean',
-				'default'     => false,
-				'context'     =>
-				array(
-					0 => 'view',
-					1 => 'edit',
-				),
-			),
-			$image_schema['featured']
-		);
-	}
-
-	/**
-	 * Test that feature field is returned inside images.
-	 */
-	public function test_products_get_images_array_contains_featured() {
-		global $wpdb;
-
-		$product     = \Automattic\WooCommerce\RestApi\UnitTests\Helpers\ProductHelper::create_simple_product();
-		$gallery_url = media_sideload_image( 'https://cldup.com/6L9h56D9Bw.jpg', $product->get_id(), 'gallery', 'src' );
-		$this->assertNotWPError( $gallery_url );
-		$gallery_id = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE guid = %s", $gallery_url ) );
-
-		$featured_url = media_sideload_image( 'https://cldup.com/Dr1Bczxq4q.png', $product->get_id(), 'featured', 'src' );
-		$this->assertNotWPError( $featured_url );
-		$featured_id = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE guid = %s", $featured_url ) );
-
-		$product->set_image_id( $featured_id[0] );
-		$product->set_gallery_image_ids( $gallery_id[0] );
-		$product->save();
-
-		$request = new WP_REST_Request( 'GET', '/wc/v3/products/' . $product->get_id() );
-		$request->set_param( '_fields', 'images' );
-		$response     = $this->server->dispatch( $request );
-		$images_array = $response->get_data()['images'];
-		$this->assertEquals( 200, $response->get_status() );
-		$this->assertTrue( $images_array[0]['featured'] );
-		$this->assertEquals( 'featured', $images_array[0]['name'] );
-		$this->assertFalse( $images_array[1]['featured'] );
-		$this->assertEquals( 'gallery', $images_array[1]['name'] );
-	}
-
 	/**
 	 * Test that the `search` parameter does partial matching in the product name, but not the SKU.
 	 *
diff --git a/plugins/woocommerce/tests/php/includes/wc-stock-functions-tests.php b/plugins/woocommerce/tests/php/includes/wc-stock-functions-tests.php
index 4e04dc29d29..615e5309350 100644
--- a/plugins/woocommerce/tests/php/includes/wc-stock-functions-tests.php
+++ b/plugins/woocommerce/tests/php/includes/wc-stock-functions-tests.php
@@ -121,7 +121,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case {
 	}
 
 	/**
-	 * Test inventory count after order status transtions which restores stock to another status which reduces stock.
+	 * Test inventory count after order status transitions which restores stock to another status which reduces stock.
 	 * Stock should not have reduced, but will reduce after transition.
 	 */
 	public function test_status_transition_stock_restore_to_stock_reduce() {
diff --git a/plugins/woocommerce/tests/php/src/Admin/API/OnboardingPluginsTest.php b/plugins/woocommerce/tests/php/src/Admin/API/OnboardingPluginsTest.php
new file mode 100644
index 00000000000..372ae7b7041
--- /dev/null
+++ b/plugins/woocommerce/tests/php/src/Admin/API/OnboardingPluginsTest.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Test the API controller class that handles the onboarding plugins REST endpoints.
+ *
+ * @package WooCommerce\Admin\Tests\Admin\API
+ */
+
+namespace Automattic\WooCommerce\Tests\Admin\API;
+
+use WC_REST_Unit_Test_Case;
+use WP_REST_Request;
+
+/**
+ * OnboardingPlugins API controller test.
+ *
+ * @class OnboardingPluginsTest.
+ */
+class OnboardingPluginsTest extends WC_REST_Unit_Test_Case {
+	/**
+	 * Endpoint.
+	 *
+	 * @var string
+	 */
+	const ENDPOINT = '/wc-admin/onboarding/plugins';
+
+	/**
+	 * Set up.
+	 */
+	public function setUp(): void {
+		parent::setUp();
+		$this->useAdmin();
+	}
+
+	/**
+	 * Use a user with administrator role.
+	 *
+	 * @return void
+	 */
+	public function useAdmin() {
+		// Register an administrator user and log in.
+		$this->user = $this->factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+		wp_set_current_user( $this->user );
+	}
+
+	/**
+	 * Use a user without any permissions.
+	 *
+	 * @return void
+	 */
+	public function useUserWithoutPluginsPermission() {
+		$this->user = $this->factory->user->create();
+		wp_set_current_user( $this->user );
+	}
+
+	/**
+	 * Request to install-async endpoint.
+	 *
+	 * @param string $endpoint Request endpoint.
+	 * @param string $body Request body.
+	 *
+	 * @return mixed
+	 */
+	private function request( $endpoint, $body ) {
+		$request = new WP_REST_Request( 'POST', self::ENDPOINT . $endpoint );
+		$request->set_header( 'content-type', 'application/json' );
+		$request->set_body( $body );
+		$response = $this->server->dispatch( $request );
+
+		return $response;
+	}
+
+	/**
+	 * Request to scheduled-installs endpoint.
+	 *
+	 * @param string $job_id job id.
+	 *
+	 * @return mixed
+	 */
+	private function get( $job_id ) {
+		$request = new WP_REST_Request( 'GET', self::ENDPOINT . '/scheduled-installs/' . $job_id );
+
+		return $this->server->dispatch( $request )->get_data();
+	}
+
+	/**
+	 * Test to confirm install-async response format.
+	 *
+	 * @return void
+	 */
+	public function test_response_format() {
+		$data = $this->request(
+			'/install-async',
+			wp_json_encode(
+				array(
+					'plugins' => array( 'test' ),
+				)
+			)
+		)->get_data();
+		$this->assertArrayHasKey( 'job_id', $data );
+		$this->assertArrayHasKey( 'status', $data );
+		$this->assertArrayHasKey( 'plugins', $data );
+		$this->assertTrue( isset( $data['plugins']['test'] ) );
+	}
+
+	/**
+	 * Test to confirm it queues an action scheduler job.
+	 *
+	 * @return void
+	 */
+	public function test_it_queues_action() {
+		$this->markTestSkipped( 'Skipping it for now until we find a better way of testing it.' );
+		$data      = $this->request(
+			'/install-async',
+			wp_json_encode(
+				array(
+					'plugins' => array( 'test' ),
+				)
+			)
+		)->get_data();
+		$action_id = $data['job_id'];
+		$data      = $this->get( $action_id );
+		$this->assertIsArray( $data );
+		$this->assertEquals( $action_id, $data['job_id'] );
+	}
+
+	/**
+	 * Test it returns 404 when an unknown job id is given.
+	 *
+	 * @return void
+	 */
+	public function test_it_returns_404_with_unknown_job_id() {
+		$request  = new WP_REST_Request( 'GET', self::ENDPOINT . '/scheduled-installs/i-do-not-exist' );
+		$response = $this->server->dispatch( $request );
+		$this->assertEquals( 404, $response->get_status() );
+	}
+
+	/**
+	 * Test permissions.
+	 *
+	 * @return void
+	 */
+	public function test_permissions() {
+		$this->useUserWithoutPluginsPermission();
+		foreach ( array( '/install-and-activate', '/install-async' ) as $endpoint ) {
+			$response = $this->request(
+				$endpoint,
+				wp_json_encode(
+					array(
+						'plugins' => array( 'test' ),
+					)
+				)
+			);
+			$this->assertEquals( 403, $response->get_status() );
+		}
+	}
+}
diff --git a/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php b/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
index 2cc1b631419..9584d95d4b8 100644
--- a/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
+++ b/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
@@ -790,4 +790,36 @@ WHERE order_id = {$order_id} AND meta_key = 'non_unique_key_1' AND meta_value in
 		$errors = $this->sut->verify_migrated_orders( array( $order1->get_id(), $order2->get_id() ) );
 		$this->assertEmpty( $errors );
 	}
+
+	/**
+	 * @testDox Test migration when SQL mode does not allow 0 dates.
+	 */
+	public function test_migration_with_null_date_and_strict_sql_mode() {
+		global $wpdb;
+
+		$order = OrderHelper::create_order();
+		delete_post_meta( $order->get_id(), '_date_paid' );
+
+		$sql_mode = $wpdb->get_var( 'SELECT @@sql_mode' );
+
+		// Set SQL mode to strict to disallow 0 dates.
+		$wpdb->query( "SET sql_mode = 'TRADITIONAL'" );
+
+		// Assert that strict mode was indeed enabled, by trying to insert 0 date.
+		$orders_table = OrdersTableDataStore::get_orders_table_name();
+		$wpdb->suppress_errors();
+
+		// phpcs:ignore -- Ignoring this error because we are testing for it.
+		$result = $wpdb->query( "INSERT INTO $orders_table (date_created_gmt) VALUES ('0000-00-00 00:00:00')" );
+		$this->assertFalse( $result );
+		$wpdb->suppress_errors( false );
+
+		$this->sut->migrate_order( $order->get_id() );
+
+		$errors = $this->sut->verify_migrated_orders( array( $order->get_id() ) );
+		$this->assertEmpty( $errors ); // _customer_user_agent
+
+		// phpcs:ignore -- Hardcoded value.
+		$wpdb->query( "SET sql_mode = '$sql_mode' " );
+	}
 }
diff --git a/plugins/woocommerce/tests/php/src/Internal/Admin/Orders/EditLockTest.php b/plugins/woocommerce/tests/php/src/Internal/Admin/Orders/EditLockTest.php
new file mode 100644
index 00000000000..dc83d944340
--- /dev/null
+++ b/plugins/woocommerce/tests/php/src/Internal/Admin/Orders/EditLockTest.php
@@ -0,0 +1,159 @@
+<?php
+
+use Automattic\WooCommerce\Internal\Admin\Orders\EditLock;
+use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
+
+/**
+ * Tests related to order edit locking in admin.
+ */
+class EditLockTest extends WC_Unit_Test_Case {
+	use HPOSToggleTrait;
+
+	/**
+	 * @var EditLock
+	 */
+	private $sut;
+
+	/**
+	 * Test order.
+	 *
+	 * @var \WC_Order
+	 */
+	private $order;
+
+	/**
+	 * Test user ID.
+	 *
+	 * @var int
+	 */
+	private $user1;
+
+	/**
+	 * Test user ID.
+	 *
+	 * @var int
+	 */
+	private $user2;
+
+	/**
+	 * Setup - enables HPOS and creates test users and order.
+	 */
+	public function setUp(): void {
+		parent::setUp();
+		$this->setup_cot();
+		$this->toggle_cot( true );
+
+		$order = new \WC_Order();
+
+		$this->sut   = new EditLock();
+		$this->order = new \WC_Order();
+		$this->order->save();
+		$this->user1 = $this->factory->user->create( array( 'role' => 'administrator' ) );
+		$this->user2 = $this->factory->user->create( array( 'role' => 'administrator' ) );
+	}
+
+	/**
+	 * Restore HPOS state.
+	 */
+	public function tearDown(): void {
+		$this->clean_up_cot_setup();
+		parent::tearDown();
+	}
+
+	/**
+	 * @testDox Basic locking works as expected.
+	 */
+	public function test_basic_locking() {
+		wp_set_current_user( $this->user1 );
+		$this->sut->lock( $this->order );
+
+		// Confirm order is locked and user1 owns the lock.
+		$this->assertTrue( $this->sut->is_locked( $this->order ) );
+		$this->assertFalse( $this->sut->is_locked_by_another_user( $this->order ) );
+
+		// user2 can't edit.
+		wp_set_current_user( $this->user2 );
+		$this->assertTrue( $this->sut->is_locked_by_another_user( $this->order ) );
+
+		// If the user no longer exists, the order shouldn't be considered locked.
+		wp_delete_user( $this->user1 );
+		$this->assertFalse( $this->sut->is_locked( $this->order ) );
+	}
+
+	/**
+	 * @testDox Order locking respects the post lock window.
+	 */
+	public function test_lock_time_window() {
+		$now           = time();
+		$five_mins_ago = $now - ( 5 * MINUTE_IN_SECONDS );
+
+		// Simulate a lock set "now".
+		$this->simulate_lock_with_time( $this->order, $now, $this->user1 );
+		$this->assertTrue( $this->sut->is_locked( $this->order ) );
+
+		// Simulate a lock set 5 mins ago.
+		$this->simulate_lock_with_time( $this->order, $five_mins_ago, $this->user1 );
+
+		// Change the lock window to 6 mins. Order should be considered locked.
+		add_filter(
+			'wp_check_post_lock_window',
+			function() {
+				return 6 * MINUTE_IN_SECONDS;
+			}
+		);
+		$this->assertTrue( $this->sut->is_locked( $this->order ) );
+
+		// With the default post window (2.5 mins), order should no longer be considered locked.
+		remove_all_filters( 'wp_check_post_lock_window' );
+		$this->assertFalse( $this->sut->is_locked( $this->order ) );
+	}
+
+	/**
+	 * @testDox Heartbeat AJAX requests correctly renew edit locks and/or inform of takeovers.
+	 */
+	public function test_edit_lock_ajax() {
+		$request_data = array(
+			'wc-refresh-order-lock' => $this->order->get_id(),
+		);
+
+		// user1 owns the lock first.
+		wp_set_current_user( $this->user1 );
+		$this->sut->lock( $this->order );
+
+		// Simulate a heartbeat, which for user 1 should result in a renewed lock.
+		$response = apply_filters( 'heartbeat_received', array(), $request_data, 'woocommerce_page_wc-orders' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment,WooCommerce.Commenting.CommentHooks.HookCommentWrongStyle
+		$this->assertArrayHasKey( 'wc-refresh-order-lock', $response );
+		$this->assertArrayHasKey( 'lock', $response['wc-refresh-order-lock'] );
+
+		// Refresh order.
+		$this->order = wc_get_order( $this->order->get_id() );
+
+		// user2 takes over.
+		wp_set_current_user( $this->user2 );
+		$this->sut->lock( $this->order );
+
+		// user1 now gets the "taken over" message when the heartbeat attempts to renew the lock.
+		wp_set_current_user( $this->user1 );
+		$response = apply_filters( 'heartbeat_received', array(), $request_data, 'woocommerce_page_wc-orders' ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment,WooCommerce.Commenting.CommentHooks.HookCommentWrongStyle
+		$this->assertArrayHasKey( 'wc-refresh-order-lock', $response );
+		$this->assertArrayHasKey( 'error', $response['wc-refresh-order-lock'] );
+
+		$user2 = get_user_by( 'id', $this->user2 );
+		$this->assertEquals( $response['wc-refresh-order-lock']['error']['user_name'], $user2->display_name );
+	}
+
+	/**
+	 * Simulates locking an order at a specific time.
+	 *
+	 * @param \WC_Order $order   Order object.
+	 * @param int       $timestamp Timestamp for the lock.
+	 * @param int       $user_id   User owning the lock.
+	 * @return void
+	 */
+	private function simulate_lock_with_time( \WC_Order $order, int $timestamp, int $user_id ): void {
+		$this->order->update_meta_data( EditLock::META_KEY_NAME, $timestamp . ':' . $user_id );
+		$this->order->save_meta_data();
+	}
+
+
+}
diff --git a/plugins/woocommerce/tests/php/src/Internal/Admin/ProductReviews/ReviewsListTableTest.php b/plugins/woocommerce/tests/php/src/Internal/Admin/ProductReviews/ReviewsListTableTest.php
index 264763239f8..0077d5bad8a 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Admin/ProductReviews/ReviewsListTableTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Admin/ProductReviews/ReviewsListTableTest.php
@@ -89,7 +89,7 @@ class ReviewsListTableTest extends WC_Unit_Test_Case {
 	 *
 	 * @param string $review_status  The review status.
 	 * @param string $column_name    The current column name being output.
-	 * @param string $primary_column The primary colum name.
+	 * @param string $primary_column The primary column name.
 	 * @param bool   $user_can_edit  Whether the current user can edit reviews.
 	 *
 	 * @return void
diff --git a/plugins/woocommerce/tests/php/src/Internal/BatchProcessing/BatchProcessingControllerTests.php b/plugins/woocommerce/tests/php/src/Internal/BatchProcessing/BatchProcessingControllerTests.php
index 9649e083266..ce01c66706f 100644
--- a/plugins/woocommerce/tests/php/src/Internal/BatchProcessing/BatchProcessingControllerTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/BatchProcessing/BatchProcessingControllerTests.php
@@ -145,7 +145,7 @@ class BatchProcessingControllerTests extends WC_Unit_Test_Case {
 	public function test_process_single_update_unfinished() {
 		$test_process_mock = $this->getMockBuilder( get_class( $this->test_process ) )->getMock();
 		$test_process_mock->method( 'get_total_pending_count' )->willReturn( 10 );
-		$test_process_mock->expects( $this->once() )->method( 'get_next_batch_to_process' )->willReturn( array( 'dummy_id' ) );
+		$test_process_mock->expects( $this->exactly( 2 ) )->method( 'get_next_batch_to_process' )->willReturn( array( 'dummy_id' ) );
 
 		add_filter(
 			'woocommerce_get_batch_processor',
@@ -166,8 +166,14 @@ class BatchProcessingControllerTests extends WC_Unit_Test_Case {
 	public function test_process_single_update_finished() {
 		$test_process_mock = $this->getMockBuilder( get_class( $this->test_process ) )->getMock();
 		$test_process_mock->method( 'get_total_pending_count' )->willReturn( 0 );
-		$test_process_mock->expects( $this->once() )->method( 'get_next_batch_to_process' )->willReturn( array( 'dummy_id' ) );
-
+		$test_process_mock
+			->expects( $this->exactly( 2 ) )
+			->method( 'get_next_batch_to_process' )
+			->willReturnCallback(
+				function ( $batch_size ) {
+					return 1 === $batch_size ? array() : array( 'dummy_id' );
+				}
+			);
 		add_filter(
 			'woocommerce_get_batch_processor',
 			function() use ( $test_process_mock ) {
diff --git a/plugins/woocommerce/tests/php/src/Proxies/MockableLegacyProxyTest.php b/plugins/woocommerce/tests/php/src/Proxies/MockableLegacyProxyTest.php
index 39d033365f7..ec0f2761a68 100644
--- a/plugins/woocommerce/tests/php/src/Proxies/MockableLegacyProxyTest.php
+++ b/plugins/woocommerce/tests/php/src/Proxies/MockableLegacyProxyTest.php
@@ -204,7 +204,7 @@ class MockableLegacyProxyTest extends \WC_Unit_Test_Case {
 	}
 
 	/**
-	 * @testdox 'get_global' can be used to reigster replacements for globals.
+	 * @testdox 'get_global' can be used to register replacements for globals.
 	 */
 	public function test_register_global_mocks_can_be_used_to_replace_globals() {
 		$replacement_wpdb = new \stdClass();
diff --git a/plugins/woocommerce/woocommerce.php b/plugins/woocommerce/woocommerce.php
index 588d576c44d..e9fe31052e4 100644
--- a/plugins/woocommerce/woocommerce.php
+++ b/plugins/woocommerce/woocommerce.php
@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce
  * Plugin URI: https://woocommerce.com/
  * Description: An eCommerce toolkit that helps you sell anything. Beautifully.
- * Version: 7.8.0-dev
+ * Version: 7.9.0-dev
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain: woocommerce
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 21f8b556319..8fb01570193 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1451,7 +1451,7 @@ importers:
         version: 1.2.3(@storybook/addon-actions@6.4.19)
       '@storybook/react':
         specifier: ^6.4.19
-        version: 6.4.19(@babel/core@7.17.8)(@types/react@17.0.50)(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)
+        version: 6.4.19(@babel/core@7.17.8)(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)
       '@testing-library/dom':
         specifier: ^8.11.3
         version: 8.11.3
@@ -1949,10 +1949,22 @@ importers:
       gridicons:
         specifier: ^3.4.0
         version: 3.4.0(react@17.0.2)
+      string-similarity:
+        specifier: 4.0.4
+        version: 4.0.4
     devDependencies:
       '@babel/core':
         specifier: ^7.17.5
         version: 7.17.8
+      '@testing-library/react':
+        specifier: ^12.1.3
+        version: 12.1.4(react-dom@16.14.0)(react@17.0.2)
+      '@types/jest':
+        specifier: ^27.4.1
+        version: 27.4.1
+      '@types/string-similarity':
+        specifier: 4.0.0
+        version: 4.0.0
       '@types/wordpress__components':
         specifier: ^19.10.3
         version: 19.10.5(react-dom@16.14.0)(react@17.0.2)
@@ -1962,6 +1974,9 @@ importers:
       '@woocommerce/eslint-plugin':
         specifier: workspace:*
         version: link:../eslint-plugin
+      '@woocommerce/internal-js-tests':
+        specifier: workspace:*
+        version: link:../internal-js-tests
       '@woocommerce/internal-style-build':
         specifier: workspace:*
         version: link:../internal-style-build
@@ -2308,8 +2323,8 @@ importers:
         specifier: 7.12.1
         version: 7.12.1(@babel/core@7.12.9)
       '@playwright/test':
-        specifier: ^1.30.0
-        version: 1.30.0
+        specifier: ^1.33.0
+        version: 1.33.0
       '@typescript-eslint/eslint-plugin':
         specifier: ^5.54.0
         version: 5.54.0(@typescript-eslint/parser@5.54.0)(eslint@8.32.0)(typescript@4.9.5)
@@ -2350,8 +2365,8 @@ importers:
         specifier: 3.0.2
         version: 3.0.2(@babel/core@7.12.9)
       '@wordpress/env':
-        specifier: ^4.8.0
-        version: 4.9.0
+        specifier: ^7.0.0
+        version: 7.0.0
       '@wordpress/stylelint-config':
         specifier: 19.1.0
         version: 19.1.0(stylelint@13.13.1)
@@ -2559,9 +2574,6 @@ importers:
       memize:
         specifier: ^1.1.0
         version: 1.1.0
-      qs:
-        specifier: ^6.10.3
-        version: 6.10.3
       react:
         specifier: ^17.0.2
         version: 17.0.2
@@ -2794,6 +2806,9 @@ importers:
       '@xstate/inspect':
         specifier: 0.8.0
         version: 0.8.0(ws@8.13.0)(xstate@4.37.1)
+      '@xstate/test':
+        specifier: 0.5.1
+        version: 0.5.1(xstate@4.37.1)
       autoprefixer:
         specifier: ^10.4.2
         version: 10.4.4(postcss@8.4.12)
@@ -3030,8 +3045,8 @@ importers:
         specifier: workspace:*
         version: link:../../packages/js/eslint-plugin
       '@wordpress/env':
-        specifier: ^4.8.0
-        version: 4.9.0
+        specifier: ^7.0.0
+        version: 7.0.0
       '@wordpress/prettier-config':
         specifier: ^2.5.0
         version: 2.5.0(wp-prettier@2.6.2)
@@ -3245,14 +3260,17 @@ importers:
         specifier: ^1.10.0
         version: 1.10.0
       '@commander-js/extra-typings':
-        specifier: ^0.1.0
-        version: 0.1.0(commander@9.4.0)
+        specifier: ^10.0.3
+        version: 10.0.3(commander@10.0.1)
       '@octokit/graphql':
         specifier: 4.8.0
         version: 4.8.0
       '@octokit/graphql-schema':
         specifier: ^14.1.0
         version: 14.1.0
+      '@octokit/types':
+        specifier: ^9.2.0
+        version: 9.2.0
       '@types/uuid':
         specifier: ^9.0.1
         version: 9.0.1
@@ -3260,14 +3278,17 @@ importers:
         specifier: ^4.1.2
         version: 4.1.2
       commander:
-        specifier: ^9.4.0
-        version: 9.4.0
+        specifier: ^10.0.1
+        version: 10.0.1
       dotenv:
         specifier: ^10.0.0
         version: 10.0.0
       figlet:
         specifier: ^1.6.0
         version: 1.6.0
+      glob:
+        specifier: ^10.2.4
+        version: 10.2.4
       graphql:
         specifier: ^16.6.0
         version: 16.6.0
@@ -3510,43 +3531,6 @@ importers:
         specifier: ^5.70.0
         version: 5.70.0(uglify-js@3.14.5)(webpack-cli@4.9.2)
 
-  tools/version-bump:
-    dependencies:
-      '@commander-js/extra-typings':
-        specifier: ^0.1.0
-        version: 0.1.0(commander@9.4.0)
-      '@woocommerce/monorepo-utils':
-        specifier: workspace:*
-        version: link:../monorepo-utils
-      chalk:
-        specifier: ^4.1.2
-        version: 4.1.2
-      commander:
-        specifier: 9.4.0
-        version: 9.4.0
-      express:
-        specifier: ^4.18.1
-        version: 4.18.1
-      ora:
-        specifier: ^5.4.1
-        version: 5.4.1
-      semver:
-        specifier: ^7.3.2
-        version: 7.3.7
-      ts-node:
-        specifier: ^10.9.1
-        version: 10.9.1(@types/node@16.18.21)(typescript@4.9.5)
-    devDependencies:
-      '@tsconfig/node16':
-        specifier: ^1.0.3
-        version: 1.0.3
-      '@types/express':
-        specifier: ^4.17.13
-        version: 4.17.14
-      typescript:
-        specifier: ^4.9.5
-        version: 4.9.5
-
 packages:
 
   /@actions/core@1.10.0:
@@ -3789,7 +3773,7 @@ packages:
       '@wordpress/primitives': 3.8.0
       '@wordpress/react-i18n': 3.8.0
       classnames: 2.3.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
       react-popper: 2.2.5(@popperjs/core@2.11.4)(react@17.0.2)
@@ -3833,7 +3817,7 @@ packages:
       commander: 4.1.1
       convert-source-map: 1.8.0
       fs-readdir-recursive: 1.1.0
-      glob: 7.2.0
+      glob: 7.2.3
       lodash: 4.17.21
       make-dir: 2.1.0
       slash: 2.0.0
@@ -3908,6 +3892,7 @@ packages:
   /@babel/compat-data@7.16.4:
     resolution: {integrity: sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/compat-data@7.17.7:
     resolution: {integrity: sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==}
@@ -3931,7 +3916,7 @@ packages:
       '@babel/traverse': 7.17.3
       '@babel/types': 7.17.0
       convert-source-map: 1.8.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.0
       lodash: 4.17.21
@@ -3956,7 +3941,7 @@ packages:
       '@babel/traverse': 7.19.3
       '@babel/types': 7.19.3
       convert-source-map: 1.8.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.0
       semver: 6.3.0
@@ -3978,7 +3963,7 @@ packages:
       '@babel/traverse': 7.21.3
       '@babel/types': 7.21.3
       convert-source-map: 1.8.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.0
@@ -4090,6 +4075,7 @@ packages:
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.19.3
       semver: 6.3.0
+    dev: true
 
   /@babel/helper-compilation-targets@7.17.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==}
@@ -4154,6 +4140,7 @@ packages:
       browserslist: 4.21.4
       lru-cache: 5.1.1
       semver: 6.3.0
+    dev: true
 
   /@babel/helper-compilation-targets@7.20.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
@@ -4167,7 +4154,6 @@ packages:
       browserslist: 4.21.4
       lru-cache: 5.1.1
       semver: 6.3.0
-    dev: true
 
   /@babel/helper-compilation-targets@7.20.7(@babel/core@7.21.3):
     resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
@@ -4251,6 +4237,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.18.6
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/helper-create-class-features-plugin@7.19.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==}
@@ -4295,6 +4282,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-annotate-as-pure': 7.18.6
       regexpu-core: 5.2.1
+    dev: true
 
   /@babel/helper-create-regexp-features-plugin@7.19.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==}
@@ -4305,7 +4293,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-annotate-as-pure': 7.18.6
       regexpu-core: 5.2.1
-    dev: true
 
   /@babel/helper-create-regexp-features-plugin@7.19.0(@babel/core@7.21.3):
     resolution: {integrity: sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==}
@@ -4327,7 +4314,7 @@ packages:
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/traverse': 7.21.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.1
       semver: 6.3.0
@@ -4345,7 +4332,7 @@ packages:
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/traverse': 7.21.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.1
       semver: 6.3.0
@@ -4361,12 +4348,13 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.1
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.17.8):
     resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
@@ -4376,13 +4364,12 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.17.8)
       '@babel/helper-plugin-utils': 7.20.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.1
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.21.3):
     resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
@@ -4392,7 +4379,7 @@ packages:
       '@babel/core': 7.21.3
       '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.21.3)
       '@babel/helper-plugin-utils': 7.20.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.1
       semver: 6.3.0
@@ -4440,6 +4427,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.21.3
+    dev: true
 
   /@babel/helper-module-imports@7.16.7:
     resolution: {integrity: sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==}
@@ -4512,6 +4500,7 @@ packages:
   /@babel/helper-plugin-utils@7.14.5:
     resolution: {integrity: sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-plugin-utils@7.18.9:
     resolution: {integrity: sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==}
@@ -4534,6 +4523,7 @@ packages:
       '@babel/types': 7.21.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/helper-remap-async-to-generator@7.16.8:
     resolution: {integrity: sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==}
@@ -4559,6 +4549,7 @@ packages:
       '@babel/types': 7.21.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.17.8):
     resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
@@ -4573,7 +4564,6 @@ packages:
       '@babel/types': 7.21.3
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.21.3):
     resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
@@ -4600,6 +4590,7 @@ packages:
       '@babel/types': 7.21.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/helper-replace-supers@7.20.7:
     resolution: {integrity: sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==}
@@ -4649,10 +4640,12 @@ packages:
   /@babel/helper-validator-option@7.14.5:
     resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-validator-option@7.16.7:
     resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-validator-option@7.18.6:
     resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
@@ -4860,6 +4853,7 @@ packages:
       '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.12.9)
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-proposal-async-generator-functions@7.16.8(@babel/core@7.12.9):
     resolution: {integrity: sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==}
@@ -4916,6 +4910,7 @@ packages:
       '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.12.9)
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
@@ -4930,7 +4925,6 @@ packages:
       '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.17.8)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.21.3):
     resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
@@ -4957,6 +4951,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-proposal-class-properties@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==}
@@ -4966,7 +4961,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-create-class-features-plugin': 7.17.6(@babel/core@7.12.9)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-plugin-utils': 7.18.9
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4991,7 +4986,7 @@ packages:
     dependencies:
       '@babel/core': 7.21.3
       '@babel/helper-create-class-features-plugin': 7.17.6(@babel/core@7.21.3)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-plugin-utils': 7.18.9
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -5007,6 +5002,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
@@ -5019,7 +5015,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
@@ -5153,6 +5148,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-dynamic-import@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
@@ -5219,16 +5215,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.3)
 
-  /@babel/plugin-proposal-export-default-from@7.16.7(@babel/core@7.12.9):
-    resolution: {integrity: sha512-+cENpW1rgIjExn+o5c8Jw/4BuH4eGKKYvkMB8/0ZxFQ9mC0t4z09VsPIwNg6waF69QYC81zxGeAsREGuqQoKeg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-export-default-from': 7.16.7(@babel/core@7.12.9)
-
   /@babel/plugin-proposal-export-default-from@7.16.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-+cENpW1rgIjExn+o5c8Jw/4BuH4eGKKYvkMB8/0ZxFQ9mC0t4z09VsPIwNg6waF69QYC81zxGeAsREGuqQoKeg==}
     engines: {node: '>=6.9.0'}
@@ -5238,7 +5224,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-export-default-from': 7.16.7(@babel/core@7.17.8)
-    dev: true
 
   /@babel/plugin-proposal-export-default-from@7.16.7(@babel/core@7.21.3):
     resolution: {integrity: sha512-+cENpW1rgIjExn+o5c8Jw/4BuH4eGKKYvkMB8/0ZxFQ9mC0t4z09VsPIwNg6waF69QYC81zxGeAsREGuqQoKeg==}
@@ -5259,6 +5244,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-export-namespace-from@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==}
@@ -5334,6 +5320,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-json-strings@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==}
@@ -5409,6 +5396,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-logical-assignment-operators@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==}
@@ -5484,6 +5472,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-nullish-coalescing-operator@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==}
@@ -5526,6 +5515,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
@@ -5536,7 +5526,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.17.8)
-    dev: true
 
   /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
@@ -5557,6 +5546,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-numeric-separator@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
@@ -5646,6 +5636,7 @@ packages:
       '@babel/helper-plugin-utils': 7.14.5
       '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.12.9)
       '@babel/plugin-transform-parameters': 7.16.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-object-rest-spread@7.17.3(@babel/core@7.12.9):
     resolution: {integrity: sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==}
@@ -5701,6 +5692,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.12.9)
       '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
@@ -5714,7 +5706,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.17.8)
       '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.17.8)
-    dev: true
 
   /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.21.3):
     resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
@@ -5738,6 +5729,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-optional-catch-binding@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
@@ -5781,6 +5773,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
@@ -5791,7 +5784,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.17.8)
-    dev: true
 
   /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
@@ -5813,6 +5805,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.9
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-optional-chaining@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==}
@@ -5859,6 +5852,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.9
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-proposal-optional-chaining@7.18.9(@babel/core@7.17.8):
     resolution: {integrity: sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==}
@@ -5870,7 +5864,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.9
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.17.8)
-    dev: true
 
   /@babel/plugin-proposal-optional-chaining@7.18.9(@babel/core@7.21.3):
     resolution: {integrity: sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==}
@@ -5894,6 +5887,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-proposal-private-methods@7.16.11(@babel/core@7.12.9):
     resolution: {integrity: sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==}
@@ -5979,9 +5973,9 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.12.9
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-create-class-features-plugin': 7.19.0(@babel/core@7.12.9)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.17.6(@babel/core@7.12.9)
+      '@babel/helper-plugin-utils': 7.18.9
       '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.12.9)
     transitivePeerDependencies:
       - supports-color
@@ -6009,9 +6003,9 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.3
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-create-class-features-plugin': 7.19.0(@babel/core@7.21.3)
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.17.6(@babel/core@7.21.3)
+      '@babel/helper-plugin-utils': 7.18.9
       '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.3)
     transitivePeerDependencies:
       - supports-color
@@ -6070,6 +6064,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-proposal-unicode-property-regex@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==}
@@ -6113,6 +6108,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
@@ -6150,7 +6146,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.3):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
@@ -6201,7 +6196,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.3):
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
@@ -6267,6 +6261,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.17.8):
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
@@ -6275,7 +6270,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.21.3):
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
@@ -6285,15 +6279,6 @@ packages:
       '@babel/core': 7.21.3
       '@babel/helper-plugin-utils': 7.20.2
 
-  /@babel/plugin-syntax-export-default-from@7.16.7(@babel/core@7.12.9):
-    resolution: {integrity: sha512-4C3E4NsrLOgftKaTYTULhHsuQrGv3FHrBzOMDiS7UYKIpgGBkAdawg4h+EI8zPeK9M0fiIIh72hIwsI24K7MbA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-
   /@babel/plugin-syntax-export-default-from@7.16.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-4C3E4NsrLOgftKaTYTULhHsuQrGv3FHrBzOMDiS7UYKIpgGBkAdawg4h+EI8zPeK9M0fiIIh72hIwsI24K7MbA==}
     engines: {node: '>=6.9.0'}
@@ -6302,7 +6287,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-syntax-export-default-from@7.16.7(@babel/core@7.21.3):
     resolution: {integrity: sha512-4C3E4NsrLOgftKaTYTULhHsuQrGv3FHrBzOMDiS7UYKIpgGBkAdawg4h+EI8zPeK9M0fiIIh72hIwsI24K7MbA==}
@@ -6320,6 +6304,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.17.8):
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
@@ -6338,15 +6323,6 @@ packages:
       '@babel/core': 7.21.3
       '@babel/helper-plugin-utils': 7.20.2
 
-  /@babel/plugin-syntax-flow@7.16.7(@babel/core@7.12.9):
-    resolution: {integrity: sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-
   /@babel/plugin-syntax-flow@7.16.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==}
     engines: {node: '>=6.9.0'}
@@ -6474,14 +6450,15 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.12.9):
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
+  /@babel/plugin-syntax-jsx@7.16.7(@babel/core@7.21.3):
+    resolution: {integrity: sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.12.9
+      '@babel/core': 7.21.3
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
@@ -6590,7 +6567,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.19.0
-    dev: true
 
   /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.3):
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
@@ -6615,7 +6591,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.3):
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
@@ -6724,13 +6699,13 @@ packages:
       '@babel/core': 7.21.3
       '@babel/helper-plugin-utils': 7.20.2
 
-  /@babel/plugin-syntax-typescript@7.18.6(@babel/core@7.12.9):
+  /@babel/plugin-syntax-typescript@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.12.9
+      '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
 
   /@babel/plugin-syntax-typescript@7.18.6(@babel/core@7.21.3):
@@ -6750,6 +6725,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-arrow-functions@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==}
@@ -6789,6 +6765,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-arrow-functions@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==}
@@ -6798,7 +6775,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-arrow-functions@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==}
@@ -6821,6 +6797,7 @@ packages:
       '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.12.9)
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-async-to-generator@7.16.8(@babel/core@7.12.9):
     resolution: {integrity: sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==}
@@ -6876,6 +6853,7 @@ packages:
       '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.12.9)
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-async-to-generator@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==}
@@ -6889,7 +6867,6 @@ packages:
       '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.17.8)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/plugin-transform-async-to-generator@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==}
@@ -6912,6 +6889,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-block-scoped-functions@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
@@ -6951,6 +6929,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
@@ -6960,7 +6939,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
@@ -6979,6 +6957,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-block-scoping@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==}
@@ -7018,6 +6997,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==}
@@ -7027,7 +7007,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.21.3):
     resolution: {integrity: sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==}
@@ -7054,6 +7033,7 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-classes@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==}
@@ -7130,6 +7110,7 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-classes@7.21.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==}
@@ -7149,7 +7130,6 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/plugin-transform-classes@7.21.0(@babel/core@7.21.3):
     resolution: {integrity: sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==}
@@ -7178,6 +7158,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-computed-properties@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==}
@@ -7217,6 +7198,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-computed-properties@7.18.9(@babel/core@7.17.8):
     resolution: {integrity: sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==}
@@ -7226,7 +7208,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-computed-properties@7.18.9(@babel/core@7.21.3):
     resolution: {integrity: sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==}
@@ -7245,6 +7226,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-destructuring@7.17.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==}
@@ -7284,6 +7266,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-destructuring@7.21.3(@babel/core@7.17.8):
     resolution: {integrity: sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==}
@@ -7293,7 +7276,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-destructuring@7.21.3(@babel/core@7.21.3):
     resolution: {integrity: sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==}
@@ -7313,6 +7295,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-dotall-regex@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
@@ -7356,6 +7339,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==}
@@ -7386,6 +7370,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-duplicate-keys@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==}
@@ -7455,6 +7440,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-exponentiation-operator@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
@@ -7498,6 +7484,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
@@ -7508,7 +7495,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
@@ -7520,16 +7506,6 @@ packages:
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
       '@babel/helper-plugin-utils': 7.20.2
 
-  /@babel/plugin-transform-flow-strip-types@7.16.7(@babel/core@7.12.9):
-    resolution: {integrity: sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-flow': 7.16.7(@babel/core@7.12.9)
-
   /@babel/plugin-transform-flow-strip-types@7.16.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==}
     engines: {node: '>=6.9.0'}
@@ -7558,6 +7534,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-for-of@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==}
@@ -7597,6 +7574,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-for-of@7.18.8(@babel/core@7.17.8):
     resolution: {integrity: sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==}
@@ -7606,7 +7584,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-for-of@7.18.8(@babel/core@7.21.3):
     resolution: {integrity: sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==}
@@ -7626,6 +7603,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-function-name': 7.19.0
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-function-name@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
@@ -7673,6 +7651,7 @@ packages:
       '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.12.9)
       '@babel/helper-function-name': 7.21.0
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.17.8):
     resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
@@ -7684,7 +7663,6 @@ packages:
       '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.17.8)
       '@babel/helper-function-name': 7.21.0
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.21.3):
     resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
@@ -7705,6 +7683,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-literals@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==}
@@ -7744,6 +7723,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-literals@7.18.9(@babel/core@7.17.8):
     resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
@@ -7753,7 +7733,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-literals@7.18.9(@babel/core@7.21.3):
     resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
@@ -7772,6 +7751,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-member-expression-literals@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
@@ -7811,6 +7791,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
@@ -7820,7 +7801,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
@@ -7843,6 +7823,7 @@ packages:
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-modules-amd@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==}
@@ -7937,6 +7918,7 @@ packages:
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-modules-commonjs@7.17.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==}
@@ -7994,6 +7976,7 @@ packages:
       '@babel/helper-simple-access': 7.20.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-modules-commonjs@7.21.2(@babel/core@7.17.8):
     resolution: {integrity: sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==}
@@ -8007,7 +7990,6 @@ packages:
       '@babel/helper-simple-access': 7.20.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/plugin-transform-modules-commonjs@7.21.2(@babel/core@7.21.3):
     resolution: {integrity: sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==}
@@ -8036,6 +8018,7 @@ packages:
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-modules-systemjs@7.17.8(@babel/core@7.12.9):
     resolution: {integrity: sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==}
@@ -8140,6 +8123,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-modules-umd@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==}
@@ -8226,6 +8210,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
+    dev: true
 
   /@babel/plugin-transform-named-capturing-groups-regex@7.16.8(@babel/core@7.12.9):
     resolution: {integrity: sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==}
@@ -8266,6 +8251,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-named-capturing-groups-regex@7.19.1(@babel/core@7.17.8):
     resolution: {integrity: sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==}
@@ -8276,7 +8262,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.17.8)
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-named-capturing-groups-regex@7.19.1(@babel/core@7.21.3):
     resolution: {integrity: sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==}
@@ -8296,6 +8281,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-new-target@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==}
@@ -8367,6 +8353,7 @@ packages:
       '@babel/helper-replace-supers': 7.19.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-object-super@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
@@ -8418,6 +8405,7 @@ packages:
       '@babel/helper-replace-supers': 7.20.7
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
@@ -8430,7 +8418,6 @@ packages:
       '@babel/helper-replace-supers': 7.20.7
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
@@ -8452,6 +8439,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-parameters@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==}
@@ -8491,6 +8479,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-parameters@7.21.3(@babel/core@7.17.8):
     resolution: {integrity: sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==}
@@ -8500,7 +8489,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-parameters@7.21.3(@babel/core@7.21.3):
     resolution: {integrity: sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==}
@@ -8519,6 +8507,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-property-literals@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
@@ -8558,6 +8547,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
@@ -8567,7 +8557,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
@@ -8588,15 +8577,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-transform-react-display-name@7.16.7(@babel/core@7.12.9):
-    resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-
   /@babel/plugin-transform-react-display-name@7.16.7(@babel/core@7.17.8):
     resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
     engines: {node: '>=6.9.0'}
@@ -8605,7 +8585,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-react-display-name@7.16.7(@babel/core@7.21.3):
     resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
@@ -8636,13 +8615,13 @@ packages:
       '@babel/plugin-transform-react-jsx': 7.19.0(@babel/core@7.21.3)
     dev: true
 
-  /@babel/plugin-transform-react-jsx-self@7.18.6(@babel/core@7.12.9):
+  /@babel/plugin-transform-react-jsx-self@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.12.9
+      '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
 
   /@babel/plugin-transform-react-jsx-self@7.18.6(@babel/core@7.21.3):
@@ -8654,13 +8633,13 @@ packages:
       '@babel/core': 7.21.3
       '@babel/helper-plugin-utils': 7.20.2
 
-  /@babel/plugin-transform-react-jsx-source@7.18.6(@babel/core@7.12.9):
+  /@babel/plugin-transform-react-jsx-source@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-utZmlASneDfdaMh0m/WausbjUjEdGrQJz0vFK93d7wD3xf5wBtX219+q6IlCNZeguIcxS2f/CvLZrlLSvSHQXw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.12.9
+      '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
 
   /@babel/plugin-transform-react-jsx-source@7.18.6(@babel/core@7.21.3):
@@ -8707,26 +8686,13 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.3
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
       '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.3)
+      '@babel/plugin-syntax-jsx': 7.16.7(@babel/core@7.21.3)
       '@babel/types': 7.21.3
     dev: true
 
-  /@babel/plugin-transform-react-jsx@7.19.0(@babel/core@7.12.9):
-    resolution: {integrity: sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.12.9)
-      '@babel/types': 7.21.3
-
   /@babel/plugin-transform-react-jsx@7.19.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==}
     engines: {node: '>=6.9.0'}
@@ -8739,7 +8705,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.17.8)
       '@babel/types': 7.21.3
-    dev: true
 
   /@babel/plugin-transform-react-jsx@7.19.0(@babel/core@7.21.3):
     resolution: {integrity: sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==}
@@ -8784,6 +8749,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       regenerator-transform: 0.14.5
+    dev: true
 
   /@babel/plugin-transform-regenerator@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==}
@@ -8855,6 +8821,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-reserved-words@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==}
@@ -8949,18 +8916,18 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-runtime@7.19.1(@babel/core@7.12.9):
+  /@babel/plugin-transform-runtime@7.19.1(@babel/core@7.17.8):
     resolution: {integrity: sha512-2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.12.9
+      '@babel/core': 7.17.8
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.20.2
-      babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.12.9)
-      babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.12.9)
-      babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.12.9)
+      babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.17.8)
+      babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.17.8)
+      babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.17.8)
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
@@ -8989,6 +8956,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-shorthand-properties@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
@@ -9028,6 +8996,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
@@ -9037,7 +9006,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
@@ -9057,6 +9025,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.9
+    dev: true
 
   /@babel/plugin-transform-spread@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==}
@@ -9100,6 +9069,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.9
+    dev: true
 
   /@babel/plugin-transform-spread@7.19.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==}
@@ -9110,7 +9080,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.9
-    dev: true
 
   /@babel/plugin-transform-spread@7.19.0(@babel/core@7.21.3):
     resolution: {integrity: sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==}
@@ -9130,6 +9099,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-sticky-regex@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
@@ -9169,6 +9139,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
@@ -9178,7 +9149,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
@@ -9197,6 +9167,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-template-literals@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==}
@@ -9236,6 +9207,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.17.8):
     resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
@@ -9245,7 +9217,6 @@ packages:
     dependencies:
       '@babel/core': 7.17.8
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.21.3):
     resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
@@ -9264,6 +9235,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-typeof-symbol@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==}
@@ -9350,16 +9322,16 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/plugin-transform-typescript@7.19.3(@babel/core@7.12.9):
+  /@babel/plugin-transform-typescript@7.19.3(@babel/core@7.17.8):
     resolution: {integrity: sha512-z6fnuK9ve9u/0X0rRvI9MY0xg+DOUaABDYOe+/SQTxtlptaBB/V9JIUxJn6xp3lMBeb9qe8xSFmHU35oZDXD+w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-create-class-features-plugin': 7.19.0(@babel/core@7.12.9)
+      '@babel/core': 7.17.8
+      '@babel/helper-create-class-features-plugin': 7.19.0(@babel/core@7.17.8)
       '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-typescript': 7.18.6(@babel/core@7.12.9)
+      '@babel/plugin-syntax-typescript': 7.18.6(@babel/core@7.17.8)
     transitivePeerDependencies:
       - supports-color
 
@@ -9384,6 +9356,7 @@ packages:
     dependencies:
       '@babel/core': 7.12.9
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-unicode-escapes@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
@@ -9453,6 +9426,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-unicode-regex@7.16.7(@babel/core@7.12.9):
     resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
@@ -9496,6 +9470,7 @@ packages:
       '@babel/core': 7.12.9
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.12.9)
       '@babel/helper-plugin-utils': 7.20.2
+    dev: true
 
   /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.17.8):
     resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
@@ -9506,7 +9481,6 @@ packages:
       '@babel/core': 7.17.8
       '@babel/helper-create-regexp-features-plugin': 7.19.0(@babel/core@7.17.8)
       '@babel/helper-plugin-utils': 7.20.2
-    dev: true
 
   /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.21.3):
     resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
@@ -9600,6 +9574,7 @@ packages:
       semver: 5.7.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@babel/preset-env@7.16.11(@babel/core@7.12.9):
     resolution: {integrity: sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==}
@@ -10147,6 +10122,7 @@ packages:
       '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.12.9)
       '@babel/types': 7.21.3
       esutils: 2.0.3
+    dev: true
 
   /@babel/preset-modules@0.1.5(@babel/core@7.17.8):
     resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
@@ -10223,8 +10199,8 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.3
-      '@babel/helper-plugin-utils': 7.18.9
-      '@babel/helper-validator-option': 7.16.7
+      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-validator-option': 7.18.6
       '@babel/plugin-transform-typescript': 7.16.8(@babel/core@7.21.3)
     transitivePeerDependencies:
       - supports-color
@@ -10351,7 +10327,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.18.6
       '@babel/parser': 7.21.3
       '@babel/types': 7.21.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -10368,7 +10344,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.18.6
       '@babel/parser': 7.21.3
       '@babel/types': 7.21.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -10385,7 +10361,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.18.6
       '@babel/parser': 7.21.3
       '@babel/types': 7.21.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -10396,6 +10372,7 @@ packages:
     dependencies:
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
+    dev: true
 
   /@babel/types@7.17.0:
     resolution: {integrity: sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==}
@@ -10450,6 +10427,14 @@ packages:
       commander: 9.4.0
     dev: false
 
+  /@commander-js/extra-typings@10.0.3(commander@10.0.1):
+    resolution: {integrity: sha512-OIw28QV/GlP8k0B5CJTRsl8IyNvd0R8C8rfo54Yz9P388vCNDgdNrFlKxZTGqps+5j6lSw3Ss9JTQwcur1w1oA==}
+    peerDependencies:
+      commander: 10.0.x
+    dependencies:
+      commander: 10.0.1
+    dev: false
+
   /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
@@ -10830,7 +10815,7 @@ packages:
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       espree: 7.3.1
       globals: 13.19.0
       ignore: 4.0.6
@@ -10847,7 +10832,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       espree: 9.4.1
       globals: 13.19.0
       ignore: 5.2.0
@@ -10957,7 +10942,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -10967,7 +10952,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -10980,6 +10965,18 @@ packages:
   /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
 
+  /@isaacs/cliui@8.0.2:
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: /string-width@4.2.3
+      strip-ansi: 7.0.1
+      strip-ansi-cjs: /strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: /wrap-ansi@7.0.0
+    dev: false
+
   /@isaacs/string-locale-compare@1.1.0:
     resolution: {integrity: sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==}
     dev: true
@@ -11966,7 +11963,7 @@ packages:
   /@kwsites/file-exists@1.1.1:
     resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -12341,7 +12338,7 @@ packages:
       '@oclif/color': 1.0.1
       '@oclif/core': 1.16.1
       chalk: 4.1.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 9.1.0
       http-call: 5.3.0
       load-json-file: 5.3.0
@@ -12359,7 +12356,7 @@ packages:
     dependencies:
       '@oclif/core': 1.16.1
       chalk: 4.1.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 9.1.0
       http-call: 5.3.0
       lodash: 4.17.21
@@ -12381,7 +12378,7 @@ packages:
       '@octokit/core': 4.0.5
       '@octokit/oauth-app': 4.2.0
       '@octokit/plugin-paginate-rest': 6.0.0(@octokit/core@4.0.5)
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       '@octokit/webhooks': 10.9.1
     transitivePeerDependencies:
       - encoding
@@ -12395,7 +12392,7 @@ packages:
       '@octokit/auth-oauth-user': 2.1.1
       '@octokit/request': 6.2.1
       '@octokit/request-error': 3.0.3
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       '@types/lru-cache': 5.1.1
       deprecation: 2.3.1
       lru-cache: 6.0.0
@@ -12412,7 +12409,7 @@ packages:
       '@octokit/auth-oauth-device': 4.0.4
       '@octokit/auth-oauth-user': 2.1.1
       '@octokit/request': 6.2.1
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       '@types/btoa-lite': 1.0.0
       btoa-lite: 1.0.0
       universal-user-agent: 6.0.0
@@ -12426,7 +12423,7 @@ packages:
     dependencies:
       '@octokit/oauth-methods': 2.0.5
       '@octokit/request': 6.2.3
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       universal-user-agent: 6.0.0
     transitivePeerDependencies:
       - encoding
@@ -12439,7 +12436,7 @@ packages:
       '@octokit/auth-oauth-device': 4.0.4
       '@octokit/oauth-methods': 2.0.5
       '@octokit/request': 6.2.1
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       btoa-lite: 1.0.0
       universal-user-agent: 6.0.0
     transitivePeerDependencies:
@@ -12464,7 +12461,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       '@octokit/request-error': 3.0.3
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
     dev: false
 
   /@octokit/core@3.5.1:
@@ -12474,7 +12471,7 @@ packages:
       '@octokit/graphql': 4.8.0
       '@octokit/request': 5.6.3
       '@octokit/request-error': 2.1.0
-      '@octokit/types': 6.34.0
+      '@octokit/types': 6.41.0
       before-after-hook: 2.2.2
       universal-user-agent: 6.0.0
     transitivePeerDependencies:
@@ -12523,7 +12520,7 @@ packages:
     resolution: {integrity: sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==}
     dependencies:
       '@octokit/request': 5.6.3
-      '@octokit/types': 6.34.0
+      '@octokit/types': 6.41.0
       universal-user-agent: 6.0.0
     transitivePeerDependencies:
       - encoding
@@ -12568,23 +12565,20 @@ packages:
       '@octokit/oauth-authorization-url': 5.0.0
       '@octokit/request': 6.2.3
       '@octokit/request-error': 3.0.3
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       btoa-lite: 1.0.0
     transitivePeerDependencies:
       - encoding
     dev: false
 
-  /@octokit/openapi-types@11.2.0:
-    resolution: {integrity: sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==}
-
   /@octokit/openapi-types@12.11.0:
     resolution: {integrity: sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==}
 
   /@octokit/openapi-types@13.10.0:
     resolution: {integrity: sha512-wPQDpTyy35D6VS/lekXDaKcxy6LI2hzcbmXBnP180Pdgz3dXRzoHdav0w09yZzzWX8HHLGuqwAeyMqEPtWY2XA==}
 
-  /@octokit/openapi-types@17.0.0:
-    resolution: {integrity: sha512-V8BVJGN0ZmMlURF55VFHFd/L92XQQ43KvFjNmY1IYbCN3V/h/uUFV6iQi19WEHM395Nn+1qhUbViCAD/1czzog==}
+  /@octokit/openapi-types@17.1.2:
+    resolution: {integrity: sha512-OaS7Ol4Y+U50PbejfzQflGWRMxO04nYWO5ZBv6JerqMKE2WS/tI9VoVDDPXHBlRMGG2fOdKwtVGlFfc7AVIstw==}
     dev: false
 
   /@octokit/plugin-paginate-rest@2.21.3(@octokit/core@3.5.1):
@@ -12613,7 +12607,7 @@ packages:
       '@octokit/core': '>=4'
     dependencies:
       '@octokit/core': 4.0.5
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
     dev: false
 
   /@octokit/plugin-request-log@1.0.4(@octokit/core@3.5.1):
@@ -12660,7 +12654,7 @@ packages:
       '@octokit/core': '>=3'
     dependencies:
       '@octokit/core': 4.0.5
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       deprecation: 2.3.1
     dev: false
 
@@ -12671,7 +12665,7 @@ packages:
       '@octokit/core': '>=3'
     dependencies:
       '@octokit/core': 4.0.5
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       bottleneck: 2.19.5
     dev: false
 
@@ -12682,7 +12676,7 @@ packages:
       '@octokit/core': ^4.0.0
     dependencies:
       '@octokit/core': 4.0.5
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       bottleneck: 2.19.5
     dev: false
 
@@ -12705,7 +12699,7 @@ packages:
     resolution: {integrity: sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==}
     engines: {node: '>= 14'}
     dependencies:
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       deprecation: 2.3.1
       once: 1.4.0
     dev: false
@@ -12742,7 +12736,7 @@ packages:
     dependencies:
       '@octokit/endpoint': 7.0.2
       '@octokit/request-error': 3.0.3
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
       is-plain-object: 5.0.0
       node-fetch: 2.6.7
       universal-user-agent: 6.0.0
@@ -12773,11 +12767,6 @@ packages:
       - encoding
     dev: false
 
-  /@octokit/types@6.34.0:
-    resolution: {integrity: sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==}
-    dependencies:
-      '@octokit/openapi-types': 11.2.0
-
   /@octokit/types@6.41.0:
     resolution: {integrity: sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==}
     dependencies:
@@ -12788,10 +12777,10 @@ packages:
     dependencies:
       '@octokit/openapi-types': 13.10.0
 
-  /@octokit/types@9.1.2:
-    resolution: {integrity: sha512-LPbJIuu1WNoRHbN4UMysEdlissRFpTCWyoKT7kHPufI8T+XX33/qilfMWJo3mCOjNIKu0+43oSQPf+HJa0+TTQ==}
+  /@octokit/types@9.2.0:
+    resolution: {integrity: sha512-xySzJG4noWrIBFyMu4lg4tu9vAgNg9S0aoLRONhAEz6ueyi1evBzb40HitIosaYS4XOexphG305IVcLrIX/30g==}
     dependencies:
-      '@octokit/openapi-types': 17.0.0
+      '@octokit/openapi-types': 17.1.2
     dev: false
 
   /@octokit/webhooks-methods@3.0.2:
@@ -12813,13 +12802,22 @@ packages:
       aggregate-error: 3.1.0
     dev: false
 
-  /@playwright/test@1.30.0:
-    resolution: {integrity: sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==}
+  /@pkgjs/parseargs@0.11.0:
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@playwright/test@1.33.0:
+    resolution: {integrity: sha512-YunBa2mE7Hq4CfPkGzQRK916a4tuZoVx/EpLjeWlTVOnD4S2+fdaQZE0LJkbfhN5FTSKNLdcl7MoT5XB37bTkg==}
     engines: {node: '>=14'}
     hasBin: true
     dependencies:
       '@types/node': 16.18.21
-      playwright-core: 1.30.0
+      playwright-core: 1.33.0
+    optionalDependencies:
+      fsevents: 2.3.2
     dev: true
 
   /@pmmmwh/react-refresh-webpack-plugin@0.5.1(react-refresh@0.11.0)(webpack@4.46.0):
@@ -12993,7 +12991,7 @@ packages:
     transitivePeerDependencies:
       - encoding
 
-  /@react-native-community/cli-plugin-metro@9.1.1(@babel/core@7.12.9):
+  /@react-native-community/cli-plugin-metro@9.1.1(@babel/core@7.17.8):
     resolution: {integrity: sha512-8CBwEZrbYIeQw69Exg/oW20pV9C6mbYlDz0pxZJ0AYmC20Q+wFFs6sUh5zm28ZUh1L0LxNGmhle/YvMPqA+fMQ==}
     dependencies:
       '@react-native-community/cli-server-api': 9.1.0
@@ -13002,7 +13000,7 @@ packages:
       metro: 0.72.2
       metro-config: 0.72.2
       metro-core: 0.72.2
-      metro-react-native-babel-transformer: 0.72.1(@babel/core@7.12.9)
+      metro-react-native-babel-transformer: 0.72.1(@babel/core@7.17.8)
       metro-resolver: 0.72.2
       metro-runtime: 0.72.2
       readline: 1.3.0
@@ -13051,7 +13049,7 @@ packages:
     dependencies:
       joi: 17.6.0
 
-  /@react-native-community/cli@9.1.1(@babel/core@7.12.9):
+  /@react-native-community/cli@9.1.1(@babel/core@7.17.8):
     resolution: {integrity: sha512-LjXcYahjFzM7TlsGzQLH9bCx3yvBsHEj/5Ytdnk0stdDET329JdXWEh6JiSRjVWPVAoDAV5pRAFmEOEGDNIiAw==}
     engines: {node: '>=14'}
     hasBin: true
@@ -13061,7 +13059,7 @@ packages:
       '@react-native-community/cli-debugger-ui': 9.0.0
       '@react-native-community/cli-doctor': 9.1.1
       '@react-native-community/cli-hermes': 9.1.0
-      '@react-native-community/cli-plugin-metro': 9.1.1(@babel/core@7.12.9)
+      '@react-native-community/cli-plugin-metro': 9.1.1(@babel/core@7.17.8)
       '@react-native-community/cli-server-api': 9.1.0
       '@react-native-community/cli-tools': 9.1.0
       '@react-native-community/cli-types': 9.1.0
@@ -13211,15 +13209,9 @@ packages:
   /@sinclair/typebox@0.25.24:
     resolution: {integrity: sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==}
 
-  /@sindresorhus/is@2.1.1:
-    resolution: {integrity: sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==}
-    engines: {node: '>=10'}
-    dev: true
-
   /@sindresorhus/is@4.6.0:
     resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
     engines: {node: '>=10'}
-    dev: false
 
   /@sinonjs/commons@1.8.3:
     resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==}
@@ -14056,8 +14048,8 @@ packages:
       core-js: 3.21.1
       css-loader: 5.2.7(webpack@5.70.0)
       fork-ts-checker-webpack-plugin: 6.5.0(eslint@8.32.0)(typescript@4.9.5)(webpack@5.70.0)
-      glob: 7.2.0
-      glob-promise: 3.4.0(glob@7.2.0)
+      glob: 7.2.3
+      glob-promise: 3.4.0(glob@7.2.3)
       html-webpack-plugin: 5.5.0(acorn@8.8.1)(webpack@5.70.0)
       path-browserify: 1.0.1
       process: 0.11.10
@@ -14647,6 +14639,81 @@ packages:
       - webpack-command
     dev: true
 
+  /@storybook/core-server@6.4.19(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12):
+    resolution: {integrity: sha512-bKsUB9f7hl5ya2JXxpIrErmbDQjoH39FVbzYZWjMo4t/b7+Xyi6vYadwyWcqlpUQmis09ZaSMv8L/Tw0TuwLAA==}
+    peerDependencies:
+      '@storybook/builder-webpack5': 6.4.19
+      '@storybook/manager-webpack5': 6.4.19
+      react: ^16.8.0 || ^17.0.0
+      react-dom: ^16.8.0 || ^17.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      '@storybook/builder-webpack5':
+        optional: true
+      '@storybook/manager-webpack5':
+        optional: true
+      typescript:
+        optional: true
+    dependencies:
+      '@discoveryjs/json-ext': 0.5.7
+      '@storybook/builder-webpack4': 6.4.19(@types/react@17.0.50)(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)
+      '@storybook/core-client': 6.4.19(@types/react@17.0.50)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack@4.46.0)
+      '@storybook/core-common': 6.4.19(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)
+      '@storybook/core-events': 6.4.19
+      '@storybook/csf': 0.0.2--canary.87bc651.0
+      '@storybook/csf-tools': 6.4.19
+      '@storybook/manager-webpack4': 6.4.19(@types/react@17.0.50)(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)
+      '@storybook/node-logger': 6.4.19
+      '@storybook/semver': 7.3.2
+      '@storybook/store': 6.4.19(react-dom@17.0.2)(react@17.0.2)
+      '@types/node': 14.14.33
+      '@types/node-fetch': 2.6.1
+      '@types/pretty-hrtime': 1.0.1
+      '@types/webpack': 4.41.32
+      better-opn: 2.1.1
+      boxen: 5.1.2
+      chalk: 4.1.2
+      cli-table3: 0.6.1
+      commander: 6.2.1
+      compression: 1.7.4
+      core-js: 3.29.1
+      cpy: 8.1.2
+      detect-port: 1.3.0
+      express: 4.18.1
+      file-system-cache: 1.0.5
+      fs-extra: 9.1.0
+      globby: 11.1.0
+      ip: 1.1.5
+      lodash: 4.17.21
+      node-fetch: 2.6.7
+      pretty-hrtime: 1.0.3
+      prompts: 2.4.2
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      regenerator-runtime: 0.13.11
+      serve-favicon: 2.5.0
+      slash: 3.0.0
+      telejson: 5.3.3
+      ts-dedent: 2.2.0
+      typescript: 4.9.5
+      util-deprecate: 1.0.2
+      watchpack: 2.4.0
+      webpack: 4.46.0(webpack-cli@3.3.12)
+      ws: 8.13.0
+    transitivePeerDependencies:
+      - '@types/react'
+      - acorn
+      - bluebird
+      - bufferutil
+      - encoding
+      - eslint
+      - supports-color
+      - utf-8-validate
+      - vue-template-compiler
+      - webpack-cli
+      - webpack-command
+    dev: true
+
   /@storybook/core@6.4.19(@storybook/builder-webpack5@6.4.19)(@storybook/manager-webpack5@6.4.19)(acorn@7.4.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack@5.70.0):
     resolution: {integrity: sha512-55LOQ/h/kf1jMhjN85t/pIEdIwWEG9yV7bdwv3niVvmoypCxyyjn9/QNK0RKYAeDSUtdm6FVoJ6k5CpxWz2d8w==}
     peerDependencies:
@@ -14789,6 +14856,41 @@ packages:
       - webpack-command
     dev: true
 
+  /@storybook/core@6.4.19(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)(webpack@4.46.0):
+    resolution: {integrity: sha512-55LOQ/h/kf1jMhjN85t/pIEdIwWEG9yV7bdwv3niVvmoypCxyyjn9/QNK0RKYAeDSUtdm6FVoJ6k5CpxWz2d8w==}
+    peerDependencies:
+      '@storybook/builder-webpack5': 6.4.19
+      react: ^16.8.0 || ^17.0.0
+      react-dom: ^16.8.0 || ^17.0.0
+      typescript: '*'
+      webpack: '*'
+    peerDependenciesMeta:
+      '@storybook/builder-webpack5':
+        optional: true
+      typescript:
+        optional: true
+    dependencies:
+      '@storybook/core-client': 6.4.19(@types/react@17.0.50)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack@4.46.0)
+      '@storybook/core-server': 6.4.19(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      typescript: 4.9.5
+      webpack: 4.46.0(webpack-cli@3.3.12)
+    transitivePeerDependencies:
+      - '@storybook/manager-webpack5'
+      - '@types/react'
+      - acorn
+      - bluebird
+      - bufferutil
+      - encoding
+      - eslint
+      - supports-color
+      - utf-8-validate
+      - vue-template-compiler
+      - webpack-cli
+      - webpack-command
+    dev: true
+
   /@storybook/csf-tools@6.4.19:
     resolution: {integrity: sha512-gf/zRhGoAVsFwSyV2tc+jeJfZQkxF6QsaZgbUSe24/IUvGFCT/PS/jZq1qy7dECAwrTOfykgu8juyBtj6WhWyw==}
     dependencies:
@@ -15049,7 +15151,7 @@ packages:
       typescript: '>= 3.x'
       webpack: '>= 4'
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       endent: 2.1.0
       find-cache-dir: 3.3.2
       flat-cache: 3.0.4
@@ -15127,6 +15229,71 @@ packages:
       - webpack-plugin-serve
     dev: true
 
+  /@storybook/react@6.4.19(@babel/core@7.17.8)(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12):
+    resolution: {integrity: sha512-5b3i8jkVrjQGmcxxxXwCduHPIh+cluWkfeweKeQOe+lW4BR8fuUICo3AMLrYPAtB/UcaJyYkIYmTvF2mkfepFA==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': ^7.11.5
+      react: ^16.8.0 || ^17.0.0
+      react-dom: ^16.8.0 || ^17.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      typescript:
+        optional: true
+    dependencies:
+      '@babel/core': 7.17.8
+      '@babel/preset-flow': 7.16.7(@babel/core@7.17.8)
+      '@babel/preset-react': 7.16.7(@babel/core@7.17.8)
+      '@pmmmwh/react-refresh-webpack-plugin': 0.5.1(react-refresh@0.11.0)(webpack@4.46.0)
+      '@storybook/addons': 6.4.19(react-dom@17.0.2)(react@17.0.2)
+      '@storybook/core': 6.4.19(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)(webpack@4.46.0)
+      '@storybook/core-common': 6.4.19(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5)(webpack-cli@3.3.12)
+      '@storybook/csf': 0.0.2--canary.87bc651.0
+      '@storybook/node-logger': 6.4.19
+      '@storybook/react-docgen-typescript-plugin': 1.0.2-canary.253f8c1.0(typescript@4.9.5)(webpack@4.46.0)
+      '@storybook/semver': 7.3.2
+      '@storybook/store': 6.4.19(react-dom@17.0.2)(react@17.0.2)
+      '@types/webpack-env': 1.16.3
+      babel-plugin-add-react-displayname: 0.0.5
+      babel-plugin-named-asset-import: 0.3.8(@babel/core@7.17.8)
+      babel-plugin-react-docgen: 4.2.1
+      core-js: 3.29.1
+      global: 4.4.0
+      lodash: 4.17.21
+      prop-types: 15.8.1
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
+      react-refresh: 0.11.0
+      read-pkg-up: 7.0.1
+      regenerator-runtime: 0.13.11
+      ts-dedent: 2.2.0
+      typescript: 4.9.5
+      webpack: 4.46.0(webpack-cli@3.3.12)
+    transitivePeerDependencies:
+      - '@storybook/builder-webpack5'
+      - '@storybook/manager-webpack5'
+      - '@types/react'
+      - '@types/webpack'
+      - acorn
+      - bluebird
+      - bufferutil
+      - encoding
+      - eslint
+      - sockjs-client
+      - supports-color
+      - type-fest
+      - utf-8-validate
+      - vue-template-compiler
+      - webpack-cli
+      - webpack-command
+      - webpack-dev-server
+      - webpack-hot-middleware
+      - webpack-plugin-serve
+    dev: true
+
   /@storybook/react@6.4.19(@babel/core@7.21.3)(@storybook/builder-webpack5@6.4.19)(@storybook/manager-webpack5@6.4.19)(acorn@8.8.1)(eslint@8.32.0)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5):
     resolution: {integrity: sha512-5b3i8jkVrjQGmcxxxXwCduHPIh+cluWkfeweKeQOe+lW4BR8fuUICo3AMLrYPAtB/UcaJyYkIYmTvF2mkfepFA==}
     engines: {node: '>=10.13.0'}
@@ -15158,7 +15325,7 @@ packages:
       babel-plugin-add-react-displayname: 0.0.5
       babel-plugin-named-asset-import: 0.3.8(@babel/core@7.21.3)
       babel-plugin-react-docgen: 4.2.1
-      core-js: 3.21.1
+      core-js: 3.29.1
       global: 4.4.0
       lodash: 4.17.21
       prop-types: 15.8.1
@@ -15166,7 +15333,7 @@ packages:
       react-dom: 17.0.2(react@17.0.2)
       react-refresh: 0.11.0
       read-pkg-up: 7.0.1
-      regenerator-runtime: 0.13.9
+      regenerator-runtime: 0.13.11
       ts-dedent: 2.2.0
       typescript: 4.9.5
       webpack: 4.46.0(webpack-cli@3.3.12)
@@ -15564,6 +15731,20 @@ packages:
       react-error-boundary: 3.1.4(react@17.0.2)
     dev: true
 
+  /@testing-library/react@12.1.4(react-dom@16.14.0)(react@17.0.2):
+    resolution: {integrity: sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+    dependencies:
+      '@babel/runtime': 7.21.0
+      '@testing-library/dom': 8.11.3
+      '@types/react-dom': 17.0.17
+      react: 17.0.2
+      react-dom: 16.14.0(react@17.0.2)
+    dev: true
+
   /@testing-library/react@12.1.4(react-dom@17.0.2)(react@17.0.2):
     resolution: {integrity: sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA==}
     engines: {node: '>=12'}
@@ -16120,6 +16301,10 @@ packages:
   /@types/stack-utils@2.0.1:
     resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
 
+  /@types/string-similarity@4.0.0:
+    resolution: {integrity: sha512-dMS4S07fbtY1AILG/RhuwmptmzK1Ql8scmAebOTJ/8iBtK/KI17NwGwKzu1uipjj8Kk+3mfPxum56kKZE93mzQ==}
+    dev: true
+
   /@types/strip-ansi@3.0.0:
     resolution: {integrity: sha512-wVhzc+WJ/JNdV25MeaK0skxGdbdOFeqYv1sqY8yPXbsshZ0XwSbWWwfKzj836cPW+e+PpqUNvKoiac9ZqCdyRQ==}
     dev: false
@@ -16402,7 +16587,7 @@ packages:
       '@typescript-eslint/experimental-utils': 4.33.0(eslint@7.32.0)(typescript@4.9.5)
       '@typescript-eslint/parser': 4.33.0(eslint@8.32.0)(typescript@4.9.5)
       '@typescript-eslint/scope-manager': 4.33.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 7.32.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
@@ -16429,7 +16614,7 @@ packages:
       '@typescript-eslint/scope-manager': 5.54.0
       '@typescript-eslint/type-utils': 5.54.0(eslint@8.32.0)(typescript@4.9.5)
       '@typescript-eslint/utils': 5.54.0(eslint@8.32.0)(typescript@4.9.5)
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.32.0
       grapheme-splitter: 1.0.4
       ignore: 5.2.0
@@ -16517,7 +16702,7 @@ packages:
       '@typescript-eslint/scope-manager': 4.33.0
       '@typescript-eslint/types': 4.33.0
       '@typescript-eslint/typescript-estree': 4.33.0(typescript@4.9.5)
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.32.0
       typescript: 4.9.5
     transitivePeerDependencies:
@@ -16537,7 +16722,7 @@ packages:
       '@typescript-eslint/scope-manager': 5.54.0
       '@typescript-eslint/types': 5.54.0
       '@typescript-eslint/typescript-estree': 5.54.0(typescript@4.9.5)
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.32.0
       typescript: 4.9.5
     transitivePeerDependencies:
@@ -16578,7 +16763,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 5.54.0(typescript@4.9.5)
       '@typescript-eslint/utils': 5.54.0(eslint@8.32.0)(typescript@4.9.5)
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.32.0
       tsutils: 3.21.0(typescript@4.9.5)
       typescript: 4.9.5
@@ -16608,7 +16793,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint-visitor-keys: 1.3.0
       glob: 7.2.3
       is-glob: 4.0.3
@@ -16631,7 +16816,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 4.33.0
       '@typescript-eslint/visitor-keys': 4.33.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.8
@@ -16652,7 +16837,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 5.43.0
       '@typescript-eslint/visitor-keys': 5.43.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.8
@@ -16673,7 +16858,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 5.54.0
       '@typescript-eslint/visitor-keys': 5.54.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.8
@@ -17288,10 +17473,10 @@ packages:
 
   /@wordpress/base-styles@4.3.1:
     resolution: {integrity: sha512-A/PpsWP5FSni2++v+cBaSoeBRw0Yv1oK5iBXKMATxdQmPfGVPauBl365U3IUPz0lxr5ckFIq/Ey+Ejww+Pe5sQ==}
-    dev: false
 
   /@wordpress/base-styles@4.8.0:
     resolution: {integrity: sha512-xN5IFlr4uh7u9aGEeLIf6kpZp8IybW1+sGQuU1zRGtzrnImdwc085mxV3I0SzIor56JmndRx0D+Ltk+OlvF4cA==}
+    dev: false
 
   /@wordpress/blob@3.19.0:
     resolution: {integrity: sha512-nw0oOg8bUgPaVcwfpdczY77ZO1Cy844DX5yXY5gKwVB9VHHfwhttVRr85GMxq9uQhH6rzkDerX+YzIGK8x4c+A==}
@@ -18788,15 +18973,15 @@ packages:
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
 
-  /@wordpress/env@4.9.0:
-    resolution: {integrity: sha512-C2g5aOYxl1Bd9lypvEMjXZ1s1Gx/JHpFWuPlCAI8gAzwzB9jCIZkqpU85GsGScpZLAANS/N7wF3LMY68UkN9fQ==}
+  /@wordpress/env@7.0.0:
+    resolution: {integrity: sha512-C0Z/smvyEeMFPjoDo149dv/w83W9hVOIkBQSGpRzeWSwDEJVYPKeZ1sUSC4y01zdXVyIxeyWIRLSm611pYIlAQ==}
     hasBin: true
     dependencies:
       chalk: 4.1.2
       copy-dir: 1.3.0
       docker-compose: 0.22.2
       extract-zip: 1.7.0
-      got: 10.7.0
+      got: 11.8.6
       inquirer: 7.3.3
       js-yaml: 3.14.1
       ora: 4.1.1
@@ -19411,13 +19596,13 @@ packages:
       postcss-custom-properties: 10.0.0
     dev: true
 
-  /@wordpress/postcss-plugins-preset@3.10.0(postcss@8.4.12):
-    resolution: {integrity: sha512-vBXy+8e6BpUvmxcIFgldvFlTFA6kAlC+J86GcDEoIq/IFVoqSJlnX1s1QHXgG3CzTHjIlN/FNJxGxYinSMJhng==}
+  /@wordpress/postcss-plugins-preset@3.6.1(postcss@8.4.12):
+    resolution: {integrity: sha512-q/pTHuBaxwJQuT8sngj1X1R6/YETqTrc4UmWLuYJt0RDRh31NukEwbWHKEDqOOA7aEDxEBuyPA7EKiffGxYbrQ==}
     engines: {node: '>=12'}
     peerDependencies:
       postcss: ^8.0.0
     dependencies:
-      '@wordpress/base-styles': 4.8.0
+      '@wordpress/base-styles': 4.3.1
       autoprefixer: 10.4.4(postcss@8.4.12)
       postcss: 8.4.12
     dev: true
@@ -19778,7 +19963,7 @@ packages:
       '@wordpress/eslint-plugin': 9.3.0(@babel/core@7.21.3)(eslint@7.32.0)(typescript@4.9.5)
       '@wordpress/jest-preset-default': 7.1.3(@babel/core@7.21.3)(jest@26.6.3)(react-dom@17.0.2)(react@17.0.2)
       '@wordpress/npm-package-json-lint-config': 4.2.0(npm-package-json-lint@5.4.2)
-      '@wordpress/postcss-plugins-preset': 3.10.0(postcss@8.4.12)
+      '@wordpress/postcss-plugins-preset': 3.6.1(postcss@8.4.12)
       '@wordpress/prettier-config': 1.1.3
       '@wordpress/stylelint-config': 19.1.0(stylelint@13.13.1)
       babel-jest: 26.6.3(@babel/core@7.21.3)
@@ -20088,6 +20273,14 @@ packages:
       '@babel/runtime': 7.21.0
     dev: false
 
+  /@xstate/graph@1.4.2(xstate@4.37.1):
+    resolution: {integrity: sha512-XIh6opCf9ukXRj4dXe2fv2kwFFUl15B5Ob8ELNOOqDXB2BPyNwp6TaLe5KJn/na3gzC9B7LyOo+2d0dPkC8PWQ==}
+    peerDependencies:
+      xstate: ^4.30.3
+    dependencies:
+      xstate: 4.37.1
+    dev: true
+
   /@xstate/inspect@0.8.0(ws@8.13.0)(xstate@4.37.1):
     resolution: {integrity: sha512-wSkFeOnp+7dhn+zTThO0M4D2FEqZN9lGIWowJu5JLa2ojjtlzRwK8SkjcHZ4rLX8VnMev7kGjgQLrGs8kxy+hw==}
     peerDependencies:
@@ -20123,6 +20316,16 @@ packages:
       - '@types/react'
     dev: false
 
+  /@xstate/test@0.5.1(xstate@4.37.1):
+    resolution: {integrity: sha512-Ltz46QR9QvEuhlNy+zvs+5ylfpGXzDBh+jVC1/WL8w88uEbN+Wf1bJ/Bi5OWVWWEgXJxfcmlavN4hJOqtQuqgQ==}
+    peerDependencies:
+      xstate: ^4.29.0
+    dependencies:
+      '@xstate/graph': 1.4.2(xstate@4.37.1)
+      chalk: 2.4.2
+      xstate: 4.37.1
+    dev: true
+
   /@xtuc/ieee754@1.2.0:
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
 
@@ -20259,7 +20462,7 @@ packages:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -20267,7 +20470,7 @@ packages:
     resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
     engines: {node: '>= 8.0.0'}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       depd: 1.1.2
       humanize-ms: 1.2.1
     transitivePeerDependencies:
@@ -20470,7 +20673,6 @@ packages:
   /ansi-regex@6.0.1:
     resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
     engines: {node: '>=12'}
-    dev: true
 
   /ansi-styles@2.2.1:
     resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
@@ -20495,7 +20697,6 @@ packages:
   /ansi-styles@6.1.0:
     resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==}
     engines: {node: '>=12'}
-    dev: true
 
   /ansi-to-html@0.6.15:
     resolution: {integrity: sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==}
@@ -20978,13 +21179,13 @@ packages:
     peerDependencies:
       eslint: '>= 4.12.1'
     dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.21.3
-      '@babel/traverse': 7.21.3
-      '@babel/types': 7.21.3
+      '@babel/code-frame': 7.16.7
+      '@babel/parser': 7.17.8
+      '@babel/traverse': 7.17.3
+      '@babel/types': 7.17.0
       eslint: 7.32.0
       eslint-visitor-keys: 1.3.0
-      resolve: 1.22.1
+      resolve: 1.20.0
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -21459,6 +21660,7 @@ packages:
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.17.8):
     resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
@@ -21471,7 +21673,6 @@ packages:
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.21.3):
     resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
@@ -21579,6 +21780,7 @@ packages:
       core-js-compat: 3.25.5
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
@@ -21590,7 +21792,6 @@ packages:
       core-js-compat: 3.25.5
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.21.3):
     resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
@@ -21645,6 +21846,7 @@ packages:
       '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.12.9)
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.17.8):
     resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
@@ -21655,7 +21857,6 @@ packages:
       '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.17.8)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.21.3):
     resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
@@ -21802,38 +22003,38 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.3)
       '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.3)
 
-  /babel-preset-fbjs@3.4.0(@babel/core@7.12.9):
+  /babel-preset-fbjs@3.4.0(@babel/core@7.17.8):
     resolution: {integrity: sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.12.9
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.12.9)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.12.9)
-      '@babel/plugin-syntax-flow': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.12.9)
-      '@babel/plugin-transform-arrow-functions': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-computed-properties': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.12.9)
-      '@babel/plugin-transform-flow-strip-types': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-transform-for-of': 7.18.8(@babel/core@7.12.9)
-      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-modules-commonjs': 7.21.2(@babel/core@7.12.9)
-      '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.12.9)
-      '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-react-display-name': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-transform-react-jsx': 7.19.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-spread': 7.19.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.12.9)
+      '@babel/core': 7.17.8
+      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.17.8)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.17.8)
+      '@babel/plugin-syntax-flow': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.17.8)
+      '@babel/plugin-transform-arrow-functions': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-computed-properties': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.17.8)
+      '@babel/plugin-transform-flow-strip-types': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-transform-for-of': 7.18.8(@babel/core@7.17.8)
+      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-modules-commonjs': 7.21.2(@babel/core@7.17.8)
+      '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.17.8)
+      '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-react-display-name': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-transform-react-jsx': 7.19.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-spread': 7.19.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.17.8)
       babel-plugin-syntax-trailing-function-commas: 7.0.0-beta.0
     transitivePeerDependencies:
       - supports-color
@@ -22595,18 +22796,9 @@ packages:
       union-value: 1.0.1
       unset-value: 1.0.0
 
-  /cacheable-lookup@2.0.1:
-    resolution: {integrity: sha512-EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@types/keyv': 3.1.4
-      keyv: 4.1.1
-    dev: true
-
   /cacheable-lookup@5.0.4:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
-    dev: false
 
   /cacheable-request@7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
@@ -22750,7 +22942,7 @@ packages:
     resolution: {integrity: sha512-FwZ/wxjqe+5RgzF2SRsPSWsVB9+McAVRWW0tRkmbh7fBjrf3HFZZbcr8vr61p1K+NBaAPv57DRjxgIyfbHmd7g==}
     engines: {node: '>=7.6.0'}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       puppeteer-core: 1.12.2
     transitivePeerDependencies:
       - bufferutil
@@ -23428,6 +23620,11 @@ packages:
     engines: {node: '>=14'}
     dev: true
 
+  /commander@10.0.1:
+    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
+    engines: {node: '>=14'}
+    dev: false
+
   /commander@2.1.0:
     resolution: {integrity: sha512-J2wnb6TKniXNOtoHS8TSrG9IOQluPrsmyAJ8oCUJOBmv+uLBCyPYAZkD2jFvw2DCzIXNnISIM01NIvr35TkBMQ==}
     engines: {node: '>= 0.6.x'}
@@ -23760,6 +23957,7 @@ packages:
     dependencies:
       browserslist: 4.19.3
       semver: 7.0.0
+    dev: true
 
   /core-js-compat@3.21.1:
     resolution: {integrity: sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==}
@@ -24560,6 +24758,7 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 9.2.2
+    dev: true
 
   /debuglog@1.0.1:
     resolution: {integrity: sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==}
@@ -24584,19 +24783,11 @@ packages:
     resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
     engines: {node: '>=0.10'}
 
-  /decompress-response@5.0.0:
-    resolution: {integrity: sha512-TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw==}
-    engines: {node: '>=10'}
-    dependencies:
-      mimic-response: 2.1.0
-    dev: true
-
   /decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
     dependencies:
       mimic-response: 3.1.0
-    dev: false
 
   /dedent@0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
@@ -25075,7 +25266,6 @@ packages:
 
   /eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
-    dev: true
 
   /ecc-jsbn@0.1.2:
     resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
@@ -25770,7 +25960,7 @@ packages:
       eslint: ^5.0.0 || ^6.0.0
     dependencies:
       comment-parser: 0.7.6
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.32.0
       jsdoctypeparser: 6.1.0
       lodash: 4.17.21
@@ -25789,7 +25979,7 @@ packages:
       eslint: ^6.0.0 || ^7.0.0
     dependencies:
       comment-parser: 0.7.6
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 7.32.0
       jsdoctypeparser: 9.0.0
       lodash: 4.17.21
@@ -25808,7 +25998,7 @@ packages:
     dependencies:
       '@es-joy/jsdoccomment': 0.10.8
       comment-parser: 1.2.4
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 7.32.0
       esquery: 1.4.0
       jsdoc-type-pratt-parser: 1.2.0
@@ -25828,7 +26018,7 @@ packages:
     dependencies:
       '@es-joy/jsdoccomment': 0.20.1
       comment-parser: 1.3.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       escape-string-regexp: 4.0.0
       eslint: 8.32.0
       esquery: 1.4.0
@@ -25847,7 +26037,7 @@ packages:
     dependencies:
       '@es-joy/jsdoccomment': 0.36.1
       comment-parser: 1.3.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       escape-string-regexp: 4.0.0
       eslint: 8.32.0
       esquery: 1.4.0
@@ -26191,7 +26381,7 @@ packages:
       ajv: 6.12.6
       chalk: 2.4.2
       cross-spawn: 6.0.5
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       eslint-scope: 4.0.3
       eslint-utils: 1.4.3
@@ -26236,7 +26426,7 @@ packages:
       ajv: 6.12.6
       chalk: 2.4.2
       cross-spawn: 6.0.5
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       eslint-scope: 5.1.1
       eslint-utils: 1.4.3
@@ -26284,7 +26474,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       enquirer: 2.3.6
       escape-string-regexp: 4.0.0
@@ -26334,7 +26524,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
@@ -26784,7 +26974,7 @@ packages:
     engines: {node: '>= 10.17.0'}
     hasBin: true
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -27113,7 +27303,7 @@ packages:
     dependencies:
       chalk: 4.1.2
       commander: 5.1.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -27337,6 +27527,14 @@ packages:
       signal-exit: 3.0.7
     dev: true
 
+  /foreground-child@3.1.1:
+    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
+    engines: {node: '>=14'}
+    dependencies:
+      cross-spawn: 7.0.3
+      signal-exit: 4.0.2
+    dev: false
+
   /forever-agent@0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
 
@@ -27382,7 +27580,7 @@ packages:
       vue-template-compiler:
         optional: true
     dependencies:
-      '@babel/code-frame': 7.18.6
+      '@babel/code-frame': 7.16.7
       '@types/json-schema': 7.0.9
       chalk: 4.1.2
       chokidar: 3.5.3
@@ -27847,16 +28045,6 @@ packages:
     dependencies:
       is-glob: 4.0.3
 
-  /glob-promise@3.4.0(glob@7.2.0):
-    resolution: {integrity: sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      glob: '*'
-    dependencies:
-      '@types/glob': 7.2.0
-      glob: 7.2.0
-    dev: true
-
   /glob-promise@3.4.0(glob@7.2.3):
     resolution: {integrity: sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==}
     engines: {node: '>=4'}
@@ -27874,6 +28062,18 @@ packages:
   /glob-to-regexp@0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
 
+  /glob@10.2.4:
+    resolution: {integrity: sha512-fDboBse/sl1oXSLhIp0FcCJgzW9KmhC/q8ULTKC82zc+DL3TL7FNb8qlt5qqXN53MsKEUSIcb+7DLmEygOE5Yw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+    dependencies:
+      foreground-child: 3.1.1
+      jackspeak: 2.2.0
+      minimatch: 9.0.0
+      minipass: 6.0.1
+      path-scurry: 1.9.1
+    dev: false
+
   /glob@5.0.15:
     resolution: {integrity: sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==}
     dependencies:
@@ -27915,6 +28115,7 @@ packages:
       minimatch: 3.1.2
       once: 1.4.0
       path-is-absolute: 1.0.1
+    dev: true
 
   /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
@@ -28148,29 +28349,6 @@ packages:
     dependencies:
       delegate: 3.2.0
 
-  /got@10.7.0:
-    resolution: {integrity: sha512-aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@sindresorhus/is': 2.1.1
-      '@szmarczak/http-timer': 4.0.6
-      '@types/cacheable-request': 6.0.2
-      '@types/keyv': 3.1.4
-      '@types/responselike': 1.0.0
-      cacheable-lookup: 2.0.1
-      cacheable-request: 7.0.2
-      decompress-response: 5.0.0
-      duplexer3: 0.1.4
-      get-stream: 5.2.0
-      lowercase-keys: 2.0.0
-      mimic-response: 2.1.0
-      p-cancelable: 2.1.1
-      p-event: 4.2.0
-      responselike: 2.0.0
-      to-readable-stream: 2.1.0
-      type-fest: 0.10.0
-    dev: true
-
   /got@11.8.3:
     resolution: {integrity: sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==}
     engines: {node: '>=10.19.0'}
@@ -28188,6 +28366,23 @@ packages:
       responselike: 2.0.0
     dev: false
 
+  /got@11.8.6:
+    resolution: {integrity: sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==}
+    engines: {node: '>=10.19.0'}
+    dependencies:
+      '@sindresorhus/is': 4.6.0
+      '@szmarczak/http-timer': 4.0.6
+      '@types/cacheable-request': 6.0.2
+      '@types/responselike': 1.0.0
+      cacheable-lookup: 5.0.4
+      cacheable-request: 7.0.2
+      decompress-response: 6.0.0
+      http2-wrapper: 1.0.3
+      lowercase-keys: 2.0.0
+      p-cancelable: 2.1.1
+      responselike: 2.0.0
+    dev: true
+
   /got@6.7.1:
     resolution: {integrity: sha512-Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg==}
     engines: {node: '>=4'}
@@ -28924,7 +29119,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dependencies:
       content-type: 1.0.4
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       is-retry-allowed: 1.2.0
       is-stream: 2.0.1
       parse-json: 4.0.0
@@ -28963,7 +29158,7 @@ packages:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -28973,7 +29168,7 @@ packages:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -29024,7 +29219,6 @@ packages:
     dependencies:
       quick-lru: 5.1.1
       resolve-alpn: 1.2.1
-    dev: false
 
   /https-browserify@1.0.0:
     resolution: {integrity: sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=}
@@ -29045,7 +29239,7 @@ packages:
     engines: {node: '>= 6.0.0'}
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -29054,7 +29248,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -29064,7 +29258,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -29098,7 +29292,7 @@ packages:
     dependencies:
       '@tannin/sprintf': 1.2.0
       '@wordpress/compose': 3.25.3(react@17.0.2)
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       events: 3.3.0
       hash.js: 1.1.7
       interpolate-components: 1.1.1
@@ -29119,7 +29313,7 @@ packages:
       '@babel/runtime': 7.21.0
       '@tannin/sprintf': 1.2.0
       '@wordpress/compose': 3.25.3(react@17.0.2)
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       events: 3.3.0
       hash.js: 1.1.7
       interpolate-components: 1.1.1
@@ -29141,7 +29335,7 @@ packages:
       '@babel/runtime': 7.21.0
       '@tannin/sprintf': 1.2.0
       '@wordpress/compose': 5.4.1(react@17.0.2)
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       events: 3.3.0
       hash.js: 1.1.7
       lodash: 4.17.21
@@ -30179,7 +30373,7 @@ packages:
     resolution: {integrity: sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==}
     engines: {node: '>=6'}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       istanbul-lib-coverage: 2.0.5
       make-dir: 2.1.0
       rimraf: 2.7.1
@@ -30192,7 +30386,7 @@ packages:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.0
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -30245,6 +30439,15 @@ packages:
       iterate-iterator: 1.0.2
     dev: true
 
+  /jackspeak@2.2.0:
+    resolution: {integrity: sha512-r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ==}
+    engines: {node: '>=14'}
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+    dev: false
+
   /jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
@@ -32543,35 +32746,6 @@ packages:
   /jsc-android@250230.2.1:
     resolution: {integrity: sha512-KmxeBlRjwoqCnBBKGsihFtvsBHyUFlBxJPK4FzeYcIuBfdjv6jFys44JITAgSTbQD+vIdwMEfyZklsuQX0yI1Q==}
 
-  /jscodeshift@0.13.1(@babel/preset-env@7.12.7):
-    resolution: {integrity: sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==}
-    hasBin: true
-    peerDependencies:
-      '@babel/preset-env': ^7.1.6
-    dependencies:
-      '@babel/core': 7.17.8
-      '@babel/parser': 7.17.8
-      '@babel/plugin-proposal-class-properties': 7.16.7(@babel/core@7.17.8)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7(@babel/core@7.17.8)
-      '@babel/plugin-proposal-optional-chaining': 7.16.7(@babel/core@7.17.8)
-      '@babel/plugin-transform-modules-commonjs': 7.17.7(@babel/core@7.17.8)
-      '@babel/preset-env': 7.12.7(@babel/core@7.12.9)
-      '@babel/preset-flow': 7.16.7(@babel/core@7.17.8)
-      '@babel/preset-typescript': 7.16.7(@babel/core@7.17.8)
-      '@babel/register': 7.18.9(@babel/core@7.17.8)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.17.8)
-      chalk: 4.1.2
-      flow-parser: 0.121.0
-      graceful-fs: 4.2.9
-      micromatch: 3.1.10(supports-color@6.1.0)
-      neo-async: 2.6.2
-      node-dir: 0.1.17
-      recast: 0.20.5
-      temp: 0.8.4
-      write-file-atomic: 2.4.1
-    transitivePeerDependencies:
-      - supports-color
-
   /jscodeshift@0.13.1(@babel/preset-env@7.20.2):
     resolution: {integrity: sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==}
     hasBin: true
@@ -32600,7 +32774,6 @@ packages:
       write-file-atomic: 2.4.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /jsdoc-type-pratt-parser@1.1.1:
     resolution: {integrity: sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==}
@@ -33484,6 +33657,11 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
+  /lru-cache@9.1.1:
+    resolution: {integrity: sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==}
+    engines: {node: 14 || >=16.14}
+    dev: false
+
   /lru@3.1.0:
     resolution: {integrity: sha1-6n+4VG2DczOWoTCR12z+tMBoN9U=}
     engines: {node: '>= 0.4.0'}
@@ -34082,48 +34260,48 @@ packages:
     dependencies:
       uglify-es: 3.3.9
 
-  /metro-react-native-babel-preset@0.72.1(@babel/core@7.12.9):
+  /metro-react-native-babel-preset@0.72.1(@babel/core@7.17.8):
     resolution: {integrity: sha512-DlvMw2tFrCqD9OXBoN11fPM09kHC22FZpnkTmG4Pr4kecV+aDmEGxwakjUcjELrX1JCXz2MLPvqeJkbiP1f5CA==}
     peerDependencies:
       '@babel/core': '*'
     dependencies:
-      '@babel/core': 7.12.9
-      '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.12.9)
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-proposal-export-default-from': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.12.9)
-      '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-proposal-optional-chaining': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.12.9)
-      '@babel/plugin-syntax-export-default-from': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-syntax-flow': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.12.9)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.12.9)
-      '@babel/plugin-transform-arrow-functions': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-async-to-generator': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-computed-properties': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.12.9)
-      '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-flow-strip-types': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-transform-modules-commonjs': 7.21.2(@babel/core@7.12.9)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.19.1(@babel/core@7.12.9)
-      '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.12.9)
-      '@babel/plugin-transform-react-display-name': 7.16.7(@babel/core@7.12.9)
-      '@babel/plugin-transform-react-jsx': 7.19.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-react-jsx-self': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-react-jsx-source': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-runtime': 7.19.1(@babel/core@7.12.9)
-      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-spread': 7.19.0(@babel/core@7.12.9)
-      '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.12.9)
-      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.12.9)
-      '@babel/plugin-transform-typescript': 7.19.3(@babel/core@7.12.9)
-      '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.12.9)
+      '@babel/core': 7.17.8
+      '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.17.8)
+      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-proposal-export-default-from': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.17.8)
+      '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-proposal-optional-chaining': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.17.8)
+      '@babel/plugin-syntax-export-default-from': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-syntax-flow': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.17.8)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.17.8)
+      '@babel/plugin-transform-arrow-functions': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-async-to-generator': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-computed-properties': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.17.8)
+      '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-flow-strip-types': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-transform-modules-commonjs': 7.21.2(@babel/core@7.17.8)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.19.1(@babel/core@7.17.8)
+      '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.17.8)
+      '@babel/plugin-transform-react-display-name': 7.16.7(@babel/core@7.17.8)
+      '@babel/plugin-transform-react-jsx': 7.19.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-react-jsx-self': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-react-jsx-source': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-runtime': 7.19.1(@babel/core@7.17.8)
+      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-spread': 7.19.0(@babel/core@7.17.8)
+      '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.17.8)
+      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.17.8)
+      '@babel/plugin-transform-typescript': 7.19.3(@babel/core@7.17.8)
+      '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.17.8)
       '@babel/template': 7.20.7
       react-refresh: 0.4.3
     transitivePeerDependencies:
@@ -34176,16 +34354,16 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /metro-react-native-babel-transformer@0.72.1(@babel/core@7.12.9):
+  /metro-react-native-babel-transformer@0.72.1(@babel/core@7.17.8):
     resolution: {integrity: sha512-hMnN0MOgVloAk94YuXN7sLeDaZ51Y6xIcJXxIU1s/KaygAGXk6o7VAdwf2MY/IV1SIct5lkW4Gn71u/9/EvfXA==}
     peerDependencies:
       '@babel/core': '*'
     dependencies:
-      '@babel/core': 7.12.9
-      babel-preset-fbjs: 3.4.0(@babel/core@7.12.9)
+      '@babel/core': 7.17.8
+      babel-preset-fbjs: 3.4.0(@babel/core@7.17.8)
       hermes-parser: 0.8.0
       metro-babel-transformer: 0.72.1
-      metro-react-native-babel-preset: 0.72.1(@babel/core@7.12.9)
+      metro-react-native-babel-preset: 0.72.1(@babel/core@7.17.8)
       metro-source-map: 0.72.1
       nullthrows: 1.1.1
     transitivePeerDependencies:
@@ -34364,7 +34542,7 @@ packages:
   /micromark@2.11.4:
     resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       parse-entities: 2.0.0
     transitivePeerDependencies:
       - supports-color
@@ -34471,15 +34649,9 @@ packages:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
 
-  /mimic-response@2.1.0:
-    resolution: {integrity: sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==}
-    engines: {node: '>=8'}
-    dev: true
-
   /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
-    dev: false
 
   /min-document@2.19.0:
     resolution: {integrity: sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=}
@@ -34543,6 +34715,13 @@ packages:
       brace-expansion: 2.0.1
     dev: true
 
+  /minimatch@9.0.0:
+    resolution: {integrity: sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: false
+
   /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
@@ -34619,6 +34798,11 @@ packages:
       yallist: 4.0.0
     dev: true
 
+  /minipass@6.0.1:
+    resolution: {integrity: sha512-Tenl5QPpgozlOGBiveNYHg2f6y+VpxsXRoIHFUVJuSmTonXRAE6q9b8Mp/O46762/2AlW4ye4Nkyvx0fgWDKbw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dev: false
+
   /minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
@@ -35215,7 +35399,7 @@ packages:
       ajv-errors: 1.0.1(ajv@6.12.6)
       chalk: 4.1.2
       cosmiconfig: 7.0.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       ignore: 5.2.0
       is-plain-obj: 3.0.0
@@ -35494,7 +35678,7 @@ packages:
       '@oclif/plugin-warn-if-update-available': 2.0.4
       aws-sdk: 2.1215.0
       concurrently: 7.0.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       find-yarn-workspace-root: 2.0.0
       fs-extra: 8.1.0
       github-slugger: 1.4.0
@@ -35525,7 +35709,7 @@ packages:
       '@octokit/plugin-rest-endpoint-methods': 7.0.1(@octokit/core@4.0.5)
       '@octokit/plugin-retry': 4.1.3(@octokit/core@4.0.5)
       '@octokit/plugin-throttling': 5.1.1(@octokit/core@4.0.5)
-      '@octokit/types': 9.1.2
+      '@octokit/types': 9.2.0
     transitivePeerDependencies:
       - encoding
     dev: false
@@ -35828,7 +36012,7 @@ packages:
     resolution: {integrity: sha512-UJKdSzgd3KOnXXAtqN5+/eeHcvTn1hBkesEmElVgvO/NAYcxAvmjzIGmnNd3Tb/gRAvMBdNRFD4qAWdHxY6QXg==}
     engines: {node: '>=12.10.0'}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       p-queue: 6.6.2
     transitivePeerDependencies:
       - supports-color
@@ -36125,6 +36309,14 @@ packages:
       path-root-regex: 0.1.2
     dev: true
 
+  /path-scurry@1.9.1:
+    resolution: {integrity: sha512-UgmoiySyjFxP6tscZDgWGEAgsW5ok8W3F5CJDnnH2pozwSTGE6eH7vwTotMwATWA2r5xqdkKdxYPkwlJjAI/3g==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      lru-cache: 9.1.1
+      minipass: 6.0.1
+    dev: false
+
   /path-to-regexp@0.1.7:
     resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
 
@@ -36173,7 +36365,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.21.0
       crc32: 0.2.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       seed-random: 2.2.0
     transitivePeerDependencies:
       - supports-color
@@ -36250,8 +36442,8 @@ packages:
       find-up: 5.0.0
     dev: true
 
-  /playwright-core@1.30.0:
-    resolution: {integrity: sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==}
+  /playwright-core@1.33.0:
+    resolution: {integrity: sha512-aizyPE1Cj62vAECdph1iaMILpT0WUDCq3E6rW6I+dleSbBoGbktvJtzS6VHkZ4DKNEOG9qJpiom/ZxO+S15LAw==}
     engines: {node: '>=14'}
     hasBin: true
     dev: true
@@ -37548,7 +37740,7 @@ packages:
     engines: {node: '>=6.4.0'}
     requiresBuild: true
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       extract-zip: 1.7.0
       https-proxy-agent: 2.2.4
       mime: 2.6.0
@@ -37595,7 +37787,7 @@ packages:
     dependencies:
       chromium-bidi: 0.4.4(devtools-protocol@0.0.1094867)
       cross-fetch: 3.1.5
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       devtools-protocol: 0.0.1094867
       extract-zip: 2.0.1
       https-proxy-agent: 5.0.1
@@ -37616,7 +37808,7 @@ packages:
     engines: {node: '>=10.18.1'}
     dependencies:
       '@types/mime-types': 2.1.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       extract-zip: 2.0.1
       https-proxy-agent: 4.0.0
       mime: 2.6.0
@@ -37640,7 +37832,7 @@ packages:
     requiresBuild: true
     dependencies:
       '@types/mime-types': 2.1.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 2.6.0
@@ -37667,7 +37859,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dependencies:
       chalk: 2.4.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       execa: 0.10.0
       fs-extra: 6.0.1
       get-stream: 5.2.0
@@ -37732,7 +37924,6 @@ packages:
   /quick-lru@5.1.1:
     resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
     engines: {node: '>=10'}
-    dev: false
 
   /raf@3.4.1:
     resolution: {integrity: sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==}
@@ -37959,7 +38150,7 @@ packages:
       is-touch-device: 1.0.1
       lodash: 4.17.21
       moment: 2.29.4
-      object.assign: 4.1.4
+      object.assign: 4.1.2
       object.values: 1.1.5
       prop-types: 15.8.1
       raf: 3.4.1
@@ -38178,12 +38369,12 @@ packages:
       moment: 2.29.4
     dev: false
 
-  /react-native-codegen@0.70.4(@babel/preset-env@7.12.7):
+  /react-native-codegen@0.70.4(@babel/preset-env@7.20.2):
     resolution: {integrity: sha512-bPyd5jm840omfx24VRyMP+KPzAefpRDwE18w5ywMWHCWZBSqLn1qI9WgBPnavlIrjTEuzxznWQNcaA26lw8AMQ==}
     dependencies:
       '@babel/parser': 7.21.3
       flow-parser: 0.121.0
-      jscodeshift: 0.13.1(@babel/preset-env@7.12.7)
+      jscodeshift: 0.13.1(@babel/preset-env@7.20.2)
       nullthrows: 1.1.1
     transitivePeerDependencies:
       - '@babel/preset-env'
@@ -38197,10 +38388,10 @@ packages:
     peerDependencies:
       react-native: '*'
     dependencies:
-      react-native: 0.70.0(@babel/core@7.12.9)(@babel/preset-env@7.12.7)(react@18.1.0)
+      react-native: 0.70.0(@babel/core@7.17.8)(@babel/preset-env@7.20.2)(react@17.0.2)
       whatwg-url-without-unicode: 8.0.0-3
 
-  /react-native@0.70.0(@babel/core@7.12.9)(@babel/preset-env@7.12.7)(react@18.1.0):
+  /react-native@0.70.0(@babel/core@7.17.8)(@babel/preset-env@7.20.2)(react@17.0.2):
     resolution: {integrity: sha512-QjXLbrK9f+/B2eCzn6kAvglLV/8nwPuFGaFv7ggPpAzFRyx5bVN1dwQLHL3MrP7iXR/M7Jc6Nnid7tmRSic6vA==}
     engines: {node: '>=14'}
     hasBin: true
@@ -38208,7 +38399,7 @@ packages:
       react: 18.1.0
     dependencies:
       '@jest/create-cache-key-function': 27.5.1
-      '@react-native-community/cli': 9.1.1(@babel/core@7.12.9)
+      '@react-native-community/cli': 9.1.1(@babel/core@7.17.8)
       '@react-native-community/cli-platform-android': 9.1.0
       '@react-native-community/cli-platform-ios': 9.1.0
       '@react-native/assets': 1.0.0
@@ -38221,23 +38412,23 @@ packages:
       invariant: 2.2.4
       jsc-android: 250230.2.1
       memoize-one: 5.2.1
-      metro-react-native-babel-transformer: 0.72.1(@babel/core@7.12.9)
+      metro-react-native-babel-transformer: 0.72.1(@babel/core@7.17.8)
       metro-runtime: 0.72.1
       metro-source-map: 0.72.1
       mkdirp: 0.5.5
       nullthrows: 1.1.1
       pretty-format: 26.6.2
       promise: 8.2.0
-      react: 18.1.0
+      react: 17.0.2
       react-devtools-core: 4.24.0
-      react-native-codegen: 0.70.4(@babel/preset-env@7.12.7)
+      react-native-codegen: 0.70.4(@babel/preset-env@7.20.2)
       react-native-gradle-plugin: 0.70.2
       react-refresh: 0.4.3
-      react-shallow-renderer: 16.15.0(react@18.1.0)
+      react-shallow-renderer: 16.15.0(react@17.0.2)
       regenerator-runtime: 0.13.11
       scheduler: 0.22.0
       stacktrace-parser: 0.1.10
-      use-sync-external-store: 1.2.0(react@18.1.0)
+      use-sync-external-store: 1.2.0(react@17.0.2)
       whatwg-fetch: 3.6.2
       ws: 6.2.2
     transitivePeerDependencies:
@@ -38419,13 +38610,13 @@ packages:
       react: 17.0.2
       react-is: 17.0.2
 
-  /react-shallow-renderer@16.15.0(react@18.1.0):
+  /react-shallow-renderer@16.15.0(react@17.0.2):
     resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==}
     peerDependencies:
       react: ^16.0.0 || ^17.0.0 || ^18.0.0
     dependencies:
       object-assign: 4.1.1
-      react: 18.1.0
+      react: 17.0.2
       react-is: 18.2.0
 
   /react-sizeme@3.0.2:
@@ -38615,12 +38806,6 @@ packages:
       loose-envify: 1.4.0
       object-assign: 4.1.1
 
-  /react@18.1.0:
-    resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      loose-envify: 1.4.0
-
   /read-cmd-shim@3.0.1:
     resolution: {integrity: sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -38894,6 +39079,7 @@ packages:
     resolution: {integrity: sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==}
     dependencies:
       '@babel/runtime': 7.21.0
+    dev: true
 
   /regenerator-transform@0.15.0:
     resolution: {integrity: sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==}
@@ -39221,7 +39407,6 @@ packages:
 
   /resolve-alpn@1.2.1:
     resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
-    dev: false
 
   /resolve-bin@0.4.3:
     resolution: {integrity: sha512-9u8TMpc+SEHXxQXblXHz5yRvRZERkCZimFN9oz85QI3uhkh7nqfjm6OGTLg+8vucpXGcY4jLK6WkylPmt7GSvw==}
@@ -39811,6 +39996,7 @@ packages:
   /semver@7.0.0:
     resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
     hasBin: true
+    dev: true
 
   /semver@7.3.5:
     resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==}
@@ -40038,12 +40224,17 @@ packages:
   /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
+  /signal-exit@4.0.2:
+    resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==}
+    engines: {node: '>=14'}
+    dev: false
+
   /simple-git@3.14.0:
     resolution: {integrity: sha512-Paad1BkrI7vWhImLybDRYOHnh3WPsHSKXJpmKM+iGjjKNV91XaOdd+yIdZ/gqdzncHDEKYff4k+74oNo1R+U8Q==}
     dependencies:
       '@kwsites/file-exists': 1.1.1
       '@kwsites/promise-deferred': 1.1.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -40212,7 +40403,7 @@ packages:
     engines: {node: '>= 10'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       socks: 2.7.0
     transitivePeerDependencies:
       - supports-color
@@ -40223,7 +40414,7 @@ packages:
     engines: {node: '>= 10'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       socks: 2.7.0
     transitivePeerDependencies:
       - supports-color
@@ -40373,7 +40564,7 @@ packages:
   /spdy-transport@3.0.0:
     resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       detect-node: 2.1.0
       hpack.js: 2.1.6
       obuf: 1.1.2
@@ -40386,7 +40577,7 @@ packages:
     resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==}
     engines: {node: '>=6.0.0'}
     dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       handle-thing: 2.0.1
       http-deceiver: 1.2.7
       select-hose: 2.0.0
@@ -40558,6 +40749,11 @@ packages:
       char-regex: 1.0.2
       strip-ansi: 6.0.1
 
+  /string-similarity@4.0.4:
+    resolution: {integrity: sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
+    dev: false
+
   /string-template@0.2.1:
     resolution: {integrity: sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==}
     dev: true
@@ -40602,7 +40798,6 @@ packages:
       eastasianwidth: 0.2.0
       emoji-regex: 9.2.2
       strip-ansi: 7.0.1
-    dev: true
 
   /string.prototype.matchall@4.0.6:
     resolution: {integrity: sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==}
@@ -40707,7 +40902,6 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       ansi-regex: 6.0.1
-    dev: true
 
   /strip-bom-buf@1.0.0:
     resolution: {integrity: sha512-1sUIL1jck0T1mhOLP2c696BIznzT525Lkub+n4jjMHjhjhoAQA6Ye659DxdlZBr0aLDMQoTxKIpnlqxgtwjsuQ==}
@@ -40973,7 +41167,7 @@ packages:
       balanced-match: 2.0.0
       chalk: 4.1.2
       cosmiconfig: 7.0.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       execall: 2.0.0
       fast-glob: 3.2.7
       fastest-levenshtein: 1.0.12
@@ -41032,7 +41226,7 @@ packages:
       balanced-match: 1.0.2
       chalk: 4.1.2
       cosmiconfig: 7.0.1
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       execall: 2.0.0
       fast-glob: 3.2.11
       fastest-levenshtein: 1.0.12
@@ -41152,7 +41346,7 @@ packages:
     dependencies:
       component-emitter: 1.3.0
       cookiejar: 2.1.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       fast-safe-stringify: 2.1.1
       form-data: 4.0.0
       formidable: 2.0.1
@@ -41219,6 +41413,7 @@ packages:
   /supports-color@9.2.2:
     resolution: {integrity: sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==}
     engines: {node: '>=12'}
+    dev: true
 
   /supports-hyperlinks@2.2.0:
     resolution: {integrity: sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==}
@@ -41772,11 +41967,6 @@ packages:
     dependencies:
       kind-of: 3.2.2
 
-  /to-readable-stream@2.1.0:
-    resolution: {integrity: sha512-o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w==}
-    engines: {node: '>=8'}
-    dev: true
-
   /to-regex-range@2.1.1:
     resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
     engines: {node: '>=0.10.0'}
@@ -42166,11 +42356,6 @@ packages:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
 
-  /type-fest@0.10.0:
-    resolution: {integrity: sha512-EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==}
-    engines: {node: '>=8'}
-    dev: true
-
   /type-fest@0.13.1:
     resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
     engines: {node: '>=10'}
@@ -42775,14 +42960,6 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       react: 17.0.2
-    dev: false
-
-  /use-sync-external-store@1.2.0(react@18.1.0):
-    resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      react: 18.1.0
 
   /use@3.1.1:
     resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
@@ -43099,7 +43276,7 @@ packages:
     dependencies:
       chalk: 2.4.2
       commander: 3.0.2
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -43822,7 +43999,7 @@ packages:
     resolution: {integrity: sha512-6Guapw25yCmnQHyz62TEi1OvRnIzGfyj0sVaPBhwx19QoxeD6HI2zZHWeBIUXSauJK3BIyxWPYnxlwmnqHUskg==}
     dependencies:
       chalk: 2.4.2
-      glob: 7.2.0
+      glob: 7.2.3
       moment: 2.29.1
       php-parser: 3.0.3
       text-table: 0.2.0
@@ -43831,7 +44008,7 @@ packages:
     resolution: {integrity: sha512-NMp0YsBM40CuI5vWtHpjWOuf96rPfbpGkamlJpVwYvgenIh1ynRzqVnGfsnjofgz13T2qcKkdwJY0Y2X7z+W+w==}
     dependencies:
       '@babel/runtime': 7.21.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       progress-event: 1.0.0
       uuid: 7.0.3
       wp-error: 1.3.0
@@ -43871,6 +44048,15 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
+  /wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-styles: 6.1.0
+      string-width: 5.1.2
+      strip-ansi: 7.0.1
+    dev: false
+
   /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
@@ -44251,7 +44437,7 @@ packages:
       cli-table: 0.3.11
       commander: 7.1.0
       dateformat: 4.6.3
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       diff: 5.1.0
       error: 10.4.0
       escape-string-regexp: 4.0.0
@@ -44295,7 +44481,7 @@ packages:
     dependencies:
       chalk: 4.1.2
       dargs: 7.0.0
-      debug: 4.3.4(supports-color@9.2.2)
+      debug: 4.3.4(supports-color@8.1.1)
       execa: 5.1.1
       github-username: 6.0.0
       lodash: 4.17.21
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 57851b0fece..c5eda4fbc84 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -8,6 +8,5 @@ packages:
     - 'tools/package-release'
     - 'tools/cherry-pick'
     - 'tools/release-posts'
-    - 'tools/version-bump'
     - 'tools/storybook'
     - 'tools/monorepo-utils'
diff --git a/tools/changelogger/class-package-formatter.php b/tools/changelogger/class-package-formatter.php
index 03add787d82..5dd231f58de 100644
--- a/tools/changelogger/class-package-formatter.php
+++ b/tools/changelogger/class-package-formatter.php
@@ -48,7 +48,7 @@ class Package_Formatter extends Formatter implements FormatterPlugin {
 	 * @return string Link to the version's release.
 	 */
 	public function getReleaseLink( $version ) {
-		// Catpure anything past /woocommerce in the current working directory.
+		// Capture anything past /woocommerce in the current working directory.
 		preg_match( '/\/packages\/js\/(.+)/', getcwd(), $path );
 
 		if ( ! count( $path ) ) {
diff --git a/tools/monorepo-merge/src/commands/transfer-issues/index.ts b/tools/monorepo-merge/src/commands/transfer-issues/index.ts
index 429789f0d0f..cee53398be1 100644
--- a/tools/monorepo-merge/src/commands/transfer-issues/index.ts
+++ b/tools/monorepo-merge/src/commands/transfer-issues/index.ts
@@ -76,7 +76,7 @@ export default class TransferIssues extends Command {
 
 		if ( numberOfIssues === 0 ) {
 			this.log(
-				'There are no issues to trasnfer that match this query!'
+				'There are no issues to transfer that match this query!'
 			);
 			this.exit( 0 );
 		}
diff --git a/tools/monorepo-utils/README.md b/tools/monorepo-utils/README.md
index bb3bfa3b665..971ede6d1e8 100644
--- a/tools/monorepo-utils/README.md
+++ b/tools/monorepo-utils/README.md
@@ -2,4 +2,19 @@
 
 ## Description
 
-Monorepo utilities and tooling.
+A set of CLI tools and scripts for managing the WooCommerce monorepo.
+
+## Usage
+
+This command is built on postinstall and can be run from the root of the project.
+To see a list of available commands you can run this from project root:
+
+```
+pnpm utils
+```
+
+## Development
+
+During development you can watch for changes via `pnpm start` in this directory, this will
+update the script referenced at the root package.json so you will see immediate changes as you
+re-run the CLI.
diff --git a/tools/monorepo-utils/bin/run b/tools/monorepo-utils/bin/run
deleted file mode 100755
index f6931219020..00000000000
--- a/tools/monorepo-utils/bin/run
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-const { existsSync } = require( 'fs' );
-const chalk = require( 'chalk' );
-const path = require( 'path' );
-
-const nodeModulesDirectory = path.join( __dirname, '../', 'node_modules' );
-
-if ( ! existsSync( nodeModulesDirectory ) ) {
-	console.log(
-		chalk.red(
-			'The @woocommerce/monorepo-utils must be built before running the CLI.'
-		)
-	);
-	console.log(
-		chalk.yellow(
-			'run `pnpm run build` from the root of the monorepo-utils package. or `pnpm install --filter monorepo-utils` from project root.'
-		)
-	);
-	process.exit( 1 );
-}
-
-const { program } = require( '../dist/index' );
-
-program.parse( process.argv );
diff --git a/tools/monorepo-utils/package.json b/tools/monorepo-utils/package.json
index e69ee8bdfb0..5dddac891c1 100644
--- a/tools/monorepo-utils/package.json
+++ b/tools/monorepo-utils/package.json
@@ -9,14 +9,16 @@
 	"main": "dist/index.js",
 	"dependencies": {
 		"@actions/core": "^1.10.0",
-		"@commander-js/extra-typings": "^0.1.0",
+		"@commander-js/extra-typings": "^10.0.3",
 		"@octokit/graphql": "4.8.0",
 		"@octokit/graphql-schema": "^14.1.0",
+		"@octokit/types": "^9.2.0",
 		"@types/uuid": "^9.0.1",
 		"chalk": "^4.1.2",
-		"commander": "^9.4.0",
+		"commander": "^10.0.1",
 		"dotenv": "^10.0.0",
 		"figlet": "^1.6.0",
+		"glob": "^10.2.4",
 		"graphql": "^16.6.0",
 		"octokit": "^2.0.14",
 		"ora": "^5.4.1",
diff --git a/tools/monorepo-utils/src/changefile/README.md b/tools/monorepo-utils/src/changefile/README.md
new file mode 100644
index 00000000000..d3944cafeba
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/README.md
@@ -0,0 +1,5 @@
+# Changelog CLI Utility
+
+CLI for creating changelog entries from pull request details. 
+
+Usage: `pnpm utils changefile <pr-number>`
diff --git a/tools/monorepo-utils/src/changefile/index.ts b/tools/monorepo-utils/src/changefile/index.ts
new file mode 100644
index 00000000000..f9d71fff26b
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/index.ts
@@ -0,0 +1,196 @@
+/**
+ * External dependencies
+ */
+import { Command } from '@commander-js/extra-typings';
+import { execSync } from 'child_process';
+import simpleGit from 'simple-git';
+import nodePath from 'path';
+import { existsSync } from 'fs';
+
+/**
+ * Internal dependencies
+ */
+import { Logger } from '../core/logger';
+import { isGithubCI } from '../core/environment';
+import { cloneAuthenticatedRepo, checkoutRemoteBranch } from '../core/git';
+import {
+	getPullRequestData,
+	shouldAutomateChangelog,
+	getChangelogDetails,
+} from './lib/github';
+import {
+	getAllProjectPaths,
+	getTouchedProjectsRequiringChangelog,
+} from './lib/projects';
+
+const program = new Command( 'changefile' )
+	.description( 'Changelog utilities' )
+	.option(
+		'-o --owner <owner>',
+		'Repository owner. Default: woocommerce',
+		'woocommerce'
+	)
+	.option(
+		'-n --name <name>',
+		'Repository name. Default: woocommerce',
+		'woocommerce'
+	)
+	.option(
+		'-d --dev-repo-path <devRepoPath>',
+		'Path to existing repo. Use this option to avoid cloning a fresh repo for development purposes. Note that using this option assumes dependencies are already installed.'
+	)
+	.argument( '<pr-number>', 'Pull request number' )
+	.action(
+		async (
+			prNumber: string,
+			options: {
+				owner: string;
+				name: string;
+				devRepoPath?: string;
+			}
+		) => {
+			const { owner, name, devRepoPath } = options;
+			Logger.startTask(
+				`Getting pull request data for PR number ${ prNumber }`
+			);
+			const { prBody, headOwner, branch, fileName, head, base } =
+				await getPullRequestData( { owner, name }, prNumber );
+
+			Logger.endTask();
+
+			if ( ! shouldAutomateChangelog( prBody ) ) {
+				Logger.notice(
+					`PR #${ prNumber } does not have the "Automatically create a changelog entry from the details" checkbox checked. No changelog will be created.`
+				);
+
+				process.exit( 0 );
+			}
+
+			const { significance, type, message, comment } =
+				getChangelogDetails( prBody );
+
+			Logger.startTask(
+				`Making a temporary clone of '${ headOwner }/${ name }'`
+			);
+			const tmpRepoPath = devRepoPath
+				? devRepoPath
+				: await cloneAuthenticatedRepo(
+						{ owner: headOwner, name },
+						true
+				  );
+
+			Logger.endTask();
+
+			Logger.notice(
+				`Temporary clone of '${ headOwner }/${ name }' created at ${ tmpRepoPath }`
+			);
+
+			// When a devRepoPath is provided, assume that the dependencies are already installed.
+			if ( ! devRepoPath ) {
+				Logger.notice( `Installing dependencies in ${ tmpRepoPath }` );
+				execSync( 'pnpm install', {
+					cwd: tmpRepoPath,
+					stdio: 'inherit',
+				} );
+			}
+
+			Logger.notice( `Checking out remote branch ${ branch }` );
+			await checkoutRemoteBranch( tmpRepoPath, branch );
+
+			Logger.notice(
+				`Getting all touched projects requiring a changelog`
+			);
+
+			const touchedProjectsRequiringChangelog =
+				await getTouchedProjectsRequiringChangelog(
+					tmpRepoPath,
+					base,
+					head,
+					fileName
+				);
+
+			try {
+				const allProjectPaths = await getAllProjectPaths( tmpRepoPath );
+
+				// Remove any already existing changelog files in case a change is reverted and the entry is no longer needed.
+				allProjectPaths.forEach( ( projectPath ) => {
+					const path = nodePath.join(
+						tmpRepoPath,
+						projectPath,
+						'changelog',
+						fileName
+					);
+
+					if ( existsSync( path ) ) {
+						Logger.notice(
+							`Remove existing changelog file ${ path }`
+						);
+
+						execSync( `rm ${ path }`, {
+							cwd: tmpRepoPath,
+							stdio: 'inherit',
+						} );
+					}
+				} );
+
+				touchedProjectsRequiringChangelog.forEach( ( project ) => {
+					Logger.notice(
+						`Running changelog command for ${ project }`
+					);
+					const messageExpression = message
+						? `-e "${ message }"`
+						: '';
+					const commentExpression = comment
+						? `-c "${ comment }"`
+						: '';
+					const cmd = `pnpm --filter=${ project } run changelog add -f ${ fileName } -s ${ significance } -t ${ type } ${ messageExpression } ${ commentExpression } -n`;
+					execSync( cmd, { cwd: tmpRepoPath, stdio: 'inherit' } );
+				} );
+			} catch ( e ) {
+				Logger.error( e );
+			}
+
+			Logger.notice(
+				`Changelogs created for ${ touchedProjectsRequiringChangelog.join(
+					', '
+				) }`
+			);
+
+			const git = simpleGit( {
+				baseDir: tmpRepoPath,
+				config: [ 'core.hooksPath=/dev/null' ],
+			} );
+
+			if ( isGithubCI() ) {
+				await git.raw(
+					'config',
+					'--global',
+					'user.email',
+					'github-actions@github.com'
+				);
+				await git.raw(
+					'config',
+					'--global',
+					'user.name',
+					'github-actions'
+				);
+			}
+
+			const shortStatus = await git.raw( [ 'status', '--short' ] );
+
+			if ( shortStatus.length === 0 ) {
+				Logger.notice(
+					`No changes in changelog files. Skipping commit and push.`
+				);
+				process.exit( 0 );
+			}
+
+			Logger.notice( `Adding and committing changes` );
+			await git.add( '.' );
+			await git.commit( 'Adding changelog from automation.' );
+			await git.push( 'origin', branch );
+			Logger.notice( `Pushed changes to ${ branch }` );
+		}
+	);
+
+export default program;
diff --git a/tools/monorepo-utils/src/changefile/lib/__tests__/github.ts b/tools/monorepo-utils/src/changefile/lib/__tests__/github.ts
new file mode 100644
index 00000000000..ead6aaf408f
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/__tests__/github.ts
@@ -0,0 +1,401 @@
+/**
+ * External dependencies
+ */
+import path from 'path';
+
+/**
+ * Internal dependencies
+ */
+import {
+	getChangelogSignificance,
+	getChangelogType,
+	getChangelogDetails,
+} from '../github';
+import { Logger } from '../../../core/logger';
+
+jest.mock( '../../../core/logger', () => {
+	return {
+		Logger: {
+			error: jest.fn(),
+		},
+	};
+} );
+
+describe( 'getChangelogSignificance', () => {
+	it( 'should return the selected significance', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Patch\r\n' +
+			'- [ ] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'\r\n' +
+			'</details>';
+
+		const significance = getChangelogSignificance( body );
+		expect( significance ).toBe( 'patch' );
+	} );
+
+	it( 'should error when no significance selected', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [ ] Patch\r\n' +
+			'- [ ] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'\r\n' +
+			'</details>';
+
+		const significance = getChangelogSignificance( body );
+		expect( significance ).toBeUndefined();
+		expect( Logger.error ).toHaveBeenCalledWith(
+			'No changelog significance found'
+		);
+	} );
+
+	it( 'should error when more than one significance selected', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Patch\r\n' +
+			'- [x] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'\r\n' +
+			'</details>';
+
+		const significance = getChangelogSignificance( body );
+		expect( significance ).toBeUndefined();
+		expect( Logger.error ).toHaveBeenCalledWith(
+			'Multiple changelog significances found. Only one can be entered'
+		);
+	} );
+} );
+
+describe( 'getChangelogType', () => {
+	it( 'should return the selected changelog type', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Patch\r\n' +
+			'- [ ] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'\r\n' +
+			'</details>';
+
+		const type = getChangelogType( body );
+		expect( type ).toBe( 'fix' );
+	} );
+
+	it( 'should error when no type selected', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Patch\r\n' +
+			'- [ ] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [ ] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'\r\n' +
+			'</details>';
+
+		const type = getChangelogType( body );
+		expect( type ).toBeUndefined();
+		expect( Logger.error ).toHaveBeenCalledWith(
+			'No changelog type found'
+		);
+	} );
+
+	it( 'should error more than one type selected', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Patch\r\n' +
+			'- [ ] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [ ] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [x] Update - Update existing functionality\r\n' +
+			'- [x] Dev - Development related task\r\n' +
+			'- [x] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'\r\n' +
+			'</details>';
+
+		const type = getChangelogType( body );
+		expect( type ).toBeUndefined();
+		expect( Logger.error ).toHaveBeenCalledWith(
+			'Multiple changelog types found. Only one can be entered'
+		);
+	} );
+} );
+
+describe( 'getChangelogDetails', () => {
+	it( 'should return the changelog details', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Patch\r\n' +
+			'- [ ] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'\r\n' +
+			'</details>';
+
+		const details = getChangelogDetails( body );
+		expect( details.significance ).toEqual( 'patch' );
+		expect( details.type ).toEqual( 'fix' );
+		expect( details.message ).toEqual( 'This is a very useful fix.' );
+		expect( details.comment ).toEqual( '' );
+	} );
+
+	it( 'should error if a comment and message are added', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Patch\r\n' +
+			'- [ ] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'This is a very useful fix.\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'This is a very useful comment.\r\n' +
+			'\r\n' +
+			'</details>';
+
+		const details = getChangelogDetails( body );
+		expect( details ).toBeUndefined();
+		expect( Logger.error ).toHaveBeenCalledWith(
+			'Both a message and comment were found. Only one can be entered'
+		);
+	} );
+
+	it( 'should error if a comment is entered with a significance other than patch', () => {
+		const body =
+			'### Changelog entry\r\n' +
+			'\r\n' +
+			'<!-- You can optionally choose to enter a changelog entry by checking the box and supplying data. -->\r\n' +
+			'\r\n' +
+			'- [x] Automatically create a changelog entry from the details below.\r\n' +
+			'\r\n' +
+			'<details>\r\n' +
+			'\r\n' +
+			'#### Significance\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [ ] Patch\r\n' +
+			'- [x] Minor\r\n' +
+			'- [ ] Major\r\n' +
+			'\r\n' +
+			'#### Type\r\n' +
+			'<!-- Choose only one -->\r\n' +
+			'- [x] Fix - Fixes an existing bug\r\n' +
+			'- [ ] Add - Adds functionality\r\n' +
+			'- [ ] Update - Update existing functionality\r\n' +
+			'- [ ] Dev - Development related task\r\n' +
+			'- [ ] Tweak - A minor adjustment to the codebase\r\n' +
+			'- [ ] Performance - Address performance issues\r\n' +
+			'- [ ] Enhancement\r\n' +
+			'\r\n' +
+			'#### Message\r\n' +
+			'<!-- Add a changelog message here -->\r\n' +
+			'\r\n' +
+			'#### Comment\r\n' +
+			`<!-- If the changes in this pull request don't warrant a changelog entry, you can alternatively supply a comment here. Note that comments are only accepted with a significance of "Patch" -->\r\n` +
+			'This is a very useful comment.\r\n' +
+			'\r\n' +
+			'</details>';
+
+		const details = getChangelogDetails( body );
+		expect( details ).toBeUndefined();
+		expect( Logger.error ).toHaveBeenCalledWith(
+			'Only patch changes can have a comment. Please change the significance to patch or remove the comment'
+		);
+	} );
+} );
diff --git a/tools/monorepo-utils/src/changefile/lib/__tests__/projects.ts b/tools/monorepo-utils/src/changefile/lib/__tests__/projects.ts
new file mode 100644
index 00000000000..8d69c6f6bdf
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/__tests__/projects.ts
@@ -0,0 +1,138 @@
+/**
+ * External dependencies
+ */
+import path from 'path';
+
+/**
+ * Internal dependencies
+ */
+import {
+	getAllProjectsPathsFromWorkspace,
+	getChangeloggerProjectPaths,
+	getTouchedChangeloggerProjectsPathsMappedToProjects,
+} from '../projects';
+
+const sampleWorkspaceYaml = `
+packages:
+    - 'folder-with-lots-of-projects/*'
+    - 'projects/cool-project'
+    - 'projects/very-cool-project'
+    - 'interesting-project'
+`;
+const tmpRepoPath = path.join( __dirname, 'test-repo' );
+
+describe( 'Changelog project functions', () => {
+	it( 'getAllProjectsPathsFromWorkspace should provide a list of all projects supplied by pnpm-workspace.yml', async () => {
+		const projects = await getAllProjectsPathsFromWorkspace(
+			tmpRepoPath,
+			sampleWorkspaceYaml
+		);
+		const expectedProjects = [
+			'folder-with-lots-of-projects/project-b',
+			'folder-with-lots-of-projects/project-a',
+			'projects/cool-project',
+			'projects/very-cool-project',
+			'interesting-project',
+		];
+
+		expectedProjects.forEach( ( expectedProject ) => {
+			expect( projects ).toContain( expectedProject );
+		} );
+
+		expect( projects ).toHaveLength( expectedProjects.length );
+	} );
+
+	it( 'getChangeloggerProjectPaths should provide a list of all projects that use Jetpack changelogger', async () => {
+		const projects = await getAllProjectsPathsFromWorkspace(
+			tmpRepoPath,
+			sampleWorkspaceYaml
+		);
+		const changeloggerProjects = await getChangeloggerProjectPaths(
+			tmpRepoPath,
+			projects
+		);
+
+		const expectedChangeLoggerProjects = [
+			'folder-with-lots-of-projects/project-b',
+			'folder-with-lots-of-projects/project-a',
+			'projects/very-cool-project',
+		];
+
+		expectedChangeLoggerProjects.forEach(
+			( expectedChangeLoggerProject ) => {
+				expect( changeloggerProjects ).toContain(
+					expectedChangeLoggerProject
+				);
+			}
+		);
+
+		expect( changeloggerProjects ).toHaveLength(
+			expectedChangeLoggerProjects.length
+		);
+	} );
+
+	it( 'getTouchedChangeloggerProjectsPathsMappedToProjects should combine touched and changelogger projects and return a list that is a subset of both', async () => {
+		const touchedFiles = [
+			'folder-with-lots-of-projects/project-b/src/index.js',
+			'projects/very-cool-project/src/index.js',
+		];
+		const changeLoggerProjects = [
+			'folder-with-lots-of-projects/project-b',
+			'folder-with-lots-of-projects/project-a',
+			'projects/very-cool-project',
+		];
+		const intersectedProjects =
+			getTouchedChangeloggerProjectsPathsMappedToProjects(
+				touchedFiles,
+				changeLoggerProjects
+			);
+
+		expect( intersectedProjects ).toHaveLength( 2 );
+		expect( intersectedProjects ).toContain(
+			'folder-with-lots-of-projects/project-b'
+		);
+		expect( intersectedProjects ).toContain( 'projects/very-cool-project' );
+	} );
+
+	it( 'getTouchedChangeloggerProjectsPathsMappedToProjects should map plugins and js packages to the correct name', async () => {
+		const touchedFiles = [
+			'plugins/beta-tester/src/index.js',
+			'plugins/woocommerce/src/index.js',
+			'packages/js/components/src/index.js',
+			'packages/js/data/src/index.js',
+		];
+		const changeLoggerProjects = [
+			'plugins/woocommerce',
+			'plugins/beta-tester',
+			'packages/js/data',
+			'packages/js/components',
+		];
+		const intersectedProjects =
+			getTouchedChangeloggerProjectsPathsMappedToProjects(
+				touchedFiles,
+				changeLoggerProjects
+			);
+
+		expect( intersectedProjects ).toHaveLength( 4 );
+		expect( intersectedProjects ).toContain( 'woocommerce' );
+		expect( intersectedProjects ).toContain( 'beta-tester' );
+		expect( intersectedProjects ).toContain( '@woocommerce/components' );
+		expect( intersectedProjects ).toContain( '@woocommerce/data' );
+	} );
+
+	it( 'getTouchedChangeloggerProjectsPathsMappedToProjects should handle woocommerce-admin projects mapped to woocommerce core', async () => {
+		const touchedFiles = [
+			'plugins/beta-tester/src/index.js',
+			'plugins/woocommerce-admin/src/index.js',
+		];
+		const changeLoggerProjects = [ 'plugins/woocommerce' ];
+		const intersectedProjects =
+			getTouchedChangeloggerProjectsPathsMappedToProjects(
+				touchedFiles,
+				changeLoggerProjects
+			);
+
+		expect( intersectedProjects ).toHaveLength( 1 );
+		expect( intersectedProjects ).toContain( 'woocommerce' );
+	} );
+} );
diff --git a/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/folder-with-lots-of-projects/project-a/composer.json b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/folder-with-lots-of-projects/project-a/composer.json
new file mode 100644
index 00000000000..8900b8f8445
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/folder-with-lots-of-projects/project-a/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "automattic/jetpack-changelogger": "99.99"
+    }
+}
diff --git a/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/folder-with-lots-of-projects/project-b/composer.json b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/folder-with-lots-of-projects/project-b/composer.json
new file mode 100644
index 00000000000..59fab63d390
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/folder-with-lots-of-projects/project-b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "automattic/jetpack-changelogger": "99.99"
+    }
+}
diff --git a/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/interesting-project/composer.json b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/interesting-project/composer.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/interesting-project/composer.json
@@ -0,0 +1 @@
+{}
diff --git a/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/projects/cool-project/composer.json b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/projects/cool-project/composer.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/projects/cool-project/composer.json
@@ -0,0 +1 @@
+{}
diff --git a/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/projects/very-cool-project/composer.json b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/projects/very-cool-project/composer.json
new file mode 100644
index 00000000000..8900b8f8445
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/__tests__/test-repo/projects/very-cool-project/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "automattic/jetpack-changelogger": "99.99"
+    }
+}
diff --git a/tools/monorepo-utils/src/changefile/lib/github.ts b/tools/monorepo-utils/src/changefile/lib/github.ts
new file mode 100644
index 00000000000..f418348bf48
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/github.ts
@@ -0,0 +1,167 @@
+/**
+ * Internal dependencies
+ */
+import { getPullRequest, isCommunityPullRequest } from '../../core/github/repo';
+import { Logger } from '../../core/logger';
+
+/**
+ * Get relevant data from a pull request.
+ *
+ * @param {Object} options
+ * @param {string} options.owner repository owner.
+ * @param {string} options.name  repository name.
+ * @param {string} prNumber      pull request number.
+ * @return {Promise<object>}     pull request data.
+ */
+export const getPullRequestData = async (
+	options: { owner: string; name: string },
+	prNumber: string
+) => {
+	const { owner, name } = options;
+	const prData = await getPullRequest( { owner, name, prNumber } );
+	const isCommunityPR = isCommunityPullRequest( prData, owner, name );
+	const headOwner = isCommunityPR ? prData.head.repo.owner.login : owner;
+	const branch = prData.head.ref;
+	const fileName = branch.replace( /\//g, '-' );
+	const prBody = prData.body;
+	const head = prData.head.sha;
+	const base = prData.base.sha;
+	return {
+		prBody,
+		isCommunityPR,
+		headOwner,
+		branch,
+		fileName,
+		head,
+		base,
+	};
+};
+
+/**
+ * Determine if a pull request description activates the changelog automation.
+ *
+ * @param {string} body pull request description.
+ * @return {boolean} if the pull request description activates the changelog automation.
+ */
+export const shouldAutomateChangelog = ( body: string ) => {
+	const regex =
+		/\[x\] Automatically create a changelog entry from the details/gm;
+	return regex.test( body );
+};
+
+/**
+ * Get the changelog significance from a pull request description.
+ *
+ * @param {string} body pull request description.
+ * @return {void|string} changelog significance.
+ */
+export const getChangelogSignificance = ( body: string ) => {
+	const regex = /\[x\] (Patch|Minor|Major)\r\n/gm;
+	const matches = body.match( regex );
+
+	if ( matches === null ) {
+		Logger.error( 'No changelog significance found' );
+		// Logger.error has a process.exit( 1 ) call, this return is purely for testing purposes.
+		return;
+	}
+
+	if ( matches.length > 1 ) {
+		Logger.error(
+			'Multiple changelog significances found. Only one can be entered'
+		);
+		// Logger.error has a process.exit( 1 ) call, this return is purely for testing purposes.
+		return;
+	}
+	const significance = regex.exec( body );
+
+	return significance[ 1 ].toLowerCase();
+};
+
+/**
+ * Get the changelog type from a pull request description.
+ *
+ * @param {string} body pull request description.
+ * @return {void|string} changelog type.
+ */
+export const getChangelogType = ( body: string ) => {
+	const regex =
+		/\[x\] (Fix|Add|Update|Dev|Tweak|Performance|Enhancement) -/gm;
+	const matches = body.match( regex );
+
+	if ( matches === null ) {
+		Logger.error( 'No changelog type found' );
+		// Logger.error has a process.exit( 1 ) call, this return is purely for testing purposes.
+		return;
+	}
+
+	if ( matches.length > 1 ) {
+		Logger.error(
+			'Multiple changelog types found. Only one can be entered'
+		);
+		// Logger.error has a process.exit( 1 ) call, this return is purely for testing purposes.
+		return;
+	}
+
+	const type = regex.exec( body );
+	return type[ 1 ].toLowerCase();
+};
+
+/**
+ * Get the changelog message from a pull request description.
+ *
+ * @param {string} body pull request description.
+ * @return {void|string} changelog message.
+ */
+export const getChangelogMessage = ( body: string ) => {
+	const messageRegex = /#### Message\r\n(<!--(.*)-->)?(.*)#### Comment/gms;
+	const match = messageRegex.exec( body );
+
+	if ( ! match ) {
+		Logger.error( 'No changelog message found' );
+	}
+
+	return match[ 3 ].trim();
+};
+
+/**
+ * Get the changelog comment from a pull request description.
+ *
+ * @param {string} body pull request description.
+ * @return {void|string} changelog comment.
+ */
+export const getChangelogComment = ( body: string ) => {
+	const commentRegex = /#### Comment\r\n(<!--(.*)-->)?(.*)<\/details>/gms;
+	const match = commentRegex.exec( body );
+
+	return match ? match[ 3 ].trim() : '';
+};
+
+export const getChangelogDetails = ( body: string ) => {
+	const message = getChangelogMessage( body );
+	const comment = getChangelogComment( body );
+
+	if ( comment && message ) {
+		Logger.error(
+			'Both a message and comment were found. Only one can be entered'
+		);
+		// Logger.error has a process.exit( 1 ) call, this return is purely for testing purposes.
+		return;
+	}
+
+	const significance = getChangelogSignificance( body );
+
+	if ( comment && significance !== 'patch' ) {
+		Logger.error(
+			'Only patch changes can have a comment. Please change the significance to patch or remove the comment'
+		);
+		// Logger.error has a process.exit( 1 ) call, this return is purely for testing purposes.
+		return;
+	}
+
+	return {
+		significance,
+		type: getChangelogType( body ),
+		message,
+		comment,
+	};
+};
diff --git a/tools/monorepo-utils/src/changefile/lib/projects.ts b/tools/monorepo-utils/src/changefile/lib/projects.ts
new file mode 100644
index 00000000000..b4500afc4da
--- /dev/null
+++ b/tools/monorepo-utils/src/changefile/lib/projects.ts
@@ -0,0 +1,192 @@
+/**
+ * External dependencies
+ */
+import { existsSync, readFileSync } from 'fs';
+import { readFile } from 'fs/promises';
+import path from 'path';
+import { glob } from 'glob';
+import simpleGit from 'simple-git';
+
+/**
+ * Get all projects listed in the workspace yaml file.
+ *
+ * @param {string} tmpRepoPath   Path to the temporary repository.
+ * @param {string} workspaceYaml Contents of the workspace yaml file.
+ * @return {Array<string>} List of projects.
+ */
+export const getAllProjectsPathsFromWorkspace = async (
+	tmpRepoPath: string,
+	workspaceYaml: string
+) => {
+	const rawProjects = workspaceYaml.split( '- ' );
+	// remove heading
+	rawProjects.shift();
+
+	const globbedProjects = await Promise.all(
+		rawProjects
+			.map( ( project ) => project.replace( /'/g, '' ).trim() )
+			.map( async ( project ) => {
+				if ( project.includes( '*' ) ) {
+					return await glob( project, { cwd: tmpRepoPath } );
+				}
+				return project;
+			} )
+	);
+	return globbedProjects.flat();
+};
+
+/**
+ *	Get all projects that have Jetpack changelogger enabled
+ *
+ * @param {string}        tmpRepoPath Path to the temporary repository.
+ * @param {Array<string>} projects    all projects listed in the workspace yaml file
+ * @return {Array<string>} List of projects that have Jetpack changelogger enabled.
+ */
+export const getChangeloggerProjectPaths = async (
+	tmpRepoPath: string,
+	projects: Array< string >
+) => {
+	const projectsWithComposer = projects.filter( ( project ) => {
+		return existsSync( `${ tmpRepoPath }/${ project }/composer.json` );
+	} );
+	return projectsWithComposer.filter( ( project ) => {
+		const composer = JSON.parse(
+			readFileSync(
+				`${ tmpRepoPath }/${ project }/composer.json`,
+				'utf8'
+			)
+		);
+		return (
+			( composer.require &&
+				composer.require[ 'automattic/jetpack-changelogger' ] ) ||
+			( composer[ 'require-dev' ] &&
+				composer[ 'require-dev' ][ 'automattic/jetpack-changelogger' ] )
+		);
+	} );
+};
+
+/**
+ * Get an array of all files changed in a PR.
+ *
+ * @param {string} tmpRepoPath Path to the temporary repository.
+ * @param {string} base        base hash
+ * @param {string} head        head hash
+ * @param {string} fileName    changelog file name
+ * @return {Array<string>} List of files changed in a PR.
+ */
+export const getTouchedFilePaths = async (
+	tmpRepoPath: string,
+	base: string,
+	head: string,
+	fileName: string
+) => {
+	const git = simpleGit( {
+		baseDir: tmpRepoPath,
+		config: [ 'core.hooksPath=/dev/null' ],
+	} );
+
+	// make sure base sha is available.
+	await git.raw( [
+		'remote',
+		'add',
+		'woocommerce',
+		'git@github.com:woocommerce/woocommerce.git',
+	] );
+	await git.raw( [ 'fetch', 'woocommerce', base ] );
+	const diff = await git.raw( [
+		'diff',
+		'--name-only',
+		`${ base }...${ head }`,
+	] );
+	return (
+		diff
+			.split( '\n' )
+			.filter( ( item ) => item.trim() )
+			// Don't count changelogs themselves as touched files.
+			.filter( ( item ) => ! item.includes( `/changelog/${ fileName }` ) )
+	);
+};
+
+/**
+ * Get an array of projects that have Jetpack changelogger enabled and have files changed in a PR. This function also maps names of projects that have been renamed in the monorepo from their paths.
+ *
+ * @param {Array<string>} touchedFiles         List of files changed in a PR. touchedFiles
+ * @param {Array<string>} changeloggerProjects List of projects that have Jetpack changelogger enabled.
+ * @return {Array<string>} List of projects that have Jetpack changelogger enabled and have files changed in a PR.
+ */
+export const getTouchedChangeloggerProjectsPathsMappedToProjects = (
+	touchedFiles: Array< string >,
+	changeloggerProjects: Array< string >
+) => {
+	const mappedTouchedFiles = touchedFiles.map( ( touchedProject ) => {
+		if ( touchedProject.includes( 'plugins/woocommerce-admin' ) ) {
+			return touchedProject.replace(
+				'plugins/woocommerce-admin',
+				'plugins/woocommerce'
+			);
+		}
+		return touchedProject;
+	} );
+	const touchedProjectPathsRequiringChangelog = changeloggerProjects.filter(
+		( project ) => {
+			return mappedTouchedFiles.some( ( touchedProject ) =>
+				touchedProject.includes( project + '/' )
+			);
+		}
+	);
+	return touchedProjectPathsRequiringChangelog.map( ( project ) => {
+		if ( project.includes( 'plugins/' ) ) {
+			return project.replace( 'plugins/', '' );
+		} else if ( project.includes( 'packages/js/' ) ) {
+			return project.replace( 'packages/js/', '@woocommerce/' );
+		}
+		return project;
+	} );
+};
+
+/**
+ * Get all projects listed in the workspace yaml file.
+ *
+ * @param {string} tmpRepoPath Path to the temporary repository.
+ * @return {Array<string>} List of projects.
+ */
+export const getAllProjectPaths = async ( tmpRepoPath: string ) => {
+	const workspaceYaml = await readFile(
+		path.join( tmpRepoPath, 'pnpm-workspace.yaml' ),
+		'utf8'
+	);
+	return await getAllProjectsPathsFromWorkspace( tmpRepoPath, workspaceYaml );
+};
+
+/**
+ * Get an array of projects that have Jetpack changelogger enabled and have files changed in a PR.
+ *
+ * @param {string} tmpRepoPath Path to the temporary repository.
+ * @param {string} base        base hash
+ * @param {string} head        head hash
+ * @param {string} fileName    changelog file name
+ * @return {Array<string>} List of projects that have Jetpack changelogger enabled and have files changed in a PR.
+ */
+export const getTouchedProjectsRequiringChangelog = async (
+	tmpRepoPath: string,
+	base: string,
+	head: string,
+	fileName: string
+) => {
+	const allProjectPaths = await getAllProjectPaths( tmpRepoPath );
+	const changeloggerProjectsPaths = await getChangeloggerProjectPaths(
+		tmpRepoPath,
+		allProjectPaths
+	);
+	const touchedFilePaths = await getTouchedFilePaths(
+		tmpRepoPath,
+		base,
+		head,
+		fileName
+	);
+
+	return getTouchedChangeloggerProjectsPathsMappedToProjects(
+		touchedFilePaths,
+		changeloggerProjectsPaths
+	);
+};
diff --git a/tools/monorepo-utils/src/code-freeze/commands/branch/index.ts b/tools/monorepo-utils/src/code-freeze/commands/branch/index.ts
index 256953b1ee8..9f95546bc28 100644
--- a/tools/monorepo-utils/src/code-freeze/commands/branch/index.ts
+++ b/tools/monorepo-utils/src/code-freeze/commands/branch/index.ts
@@ -20,10 +20,12 @@ import {
 } from '../../../core/github/repo';
 import { WPIncrement } from '../../../core/version';
 import { Logger } from '../../../core/logger';
-import { Options } from './types';
-import { getEnvVar } from '../../../core/environment';
+import { isGithubCI } from '../../../core/environment';
 
-const getNextReleaseBranch = async ( options: Options ) => {
+const getNextReleaseBranch = async ( options: {
+	owner?: string;
+	name?: string;
+} ) => {
 	const latestReleaseVersion = await getLatestGithubReleaseVersion( options );
 	const nextReleaseVersion = WPIncrement( latestReleaseVersion );
 	const parsedNextReleaseVersion = parse( nextReleaseVersion );
@@ -53,9 +55,9 @@ export const branchCommand = new Command( 'branch' )
 		'Branch to create the release branch from. Default: trunk',
 		'trunk'
 	)
-	.action( async ( options: Options ) => {
+	.action( async ( options ) => {
 		const { source, branch, owner, name, dryRun } = options;
-		const isGithub = getEnvVar( 'CI' );
+		const isGithub = isGithubCI();
 
 		let nextReleaseBranch;
 
diff --git a/tools/monorepo-utils/src/code-freeze/commands/branch/types.ts b/tools/monorepo-utils/src/code-freeze/commands/branch/types.ts
deleted file mode 100644
index 13ff65b4b98..00000000000
--- a/tools/monorepo-utils/src/code-freeze/commands/branch/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type Options = {
-	github?: boolean;
-	dryRun?: boolean;
-	owner?: string;
-	name?: string;
-	branch?: string;
-	source?: string;
-};
diff --git a/tools/monorepo-utils/src/code-freeze/commands/changelog/index.ts b/tools/monorepo-utils/src/code-freeze/commands/changelog/index.ts
new file mode 100644
index 00000000000..9b8aafe566f
--- /dev/null
+++ b/tools/monorepo-utils/src/code-freeze/commands/changelog/index.ts
@@ -0,0 +1,78 @@
+/**
+ * External dependencies
+ */
+import { Command } from '@commander-js/extra-typings';
+import { execSync } from 'child_process';
+
+/**
+ * Internal dependencies
+ */
+import { Logger } from '../../../core/logger';
+import { cloneAuthenticatedRepo } from '../../../core/git';
+import { updateTrunkChangelog, updateReleaseBranchChangelogs } from './lib';
+import { Options } from './types';
+
+export const changelogCommand = new Command( 'changelog' )
+	.description( 'Make changelog pull requests to trunk and release branch' )
+	.option(
+		'-o --owner <owner>',
+		'Repository owner. Default: woocommerce',
+		'woocommerce'
+	)
+	.option(
+		'-n --name <name>',
+		'Repository name. Default: woocommerce',
+		'woocommerce'
+	)
+	.option(
+		'-d --dev-repo-path <devRepoPath>',
+		'Path to existing repo. Use this option to avoid cloning a fresh repo for development purposes. Note that using this option assumes dependencies are already installed.'
+	)
+	.option(
+		'-o, --override <override>',
+		"Time Override: The time to use in checking whether the action should run (default: 'now').",
+		'now'
+	)
+	.requiredOption( '-v, --version <version>', 'Version to bump to' )
+	.action( async ( options: Options ) => {
+		const { owner, name, version, devRepoPath } = options;
+		Logger.startTask(
+			`Making a temporary clone of '${ owner }/${ name }'`
+		);
+		// Use a supplied path, otherwise do a full clone of the repo, including history so that changelogs can be created with links to PRs.
+		const tmpRepoPath = devRepoPath
+			? devRepoPath
+			: await cloneAuthenticatedRepo( options, false );
+
+		Logger.endTask();
+
+		Logger.notice(
+			`Temporary clone of '${ owner }/${ name }' created at ${ tmpRepoPath }`
+		);
+
+		// When a devRepoPath is provided, assume that the dependencies are already installed.
+		if ( ! devRepoPath ) {
+			Logger.notice( `Installing dependencies in ${ tmpRepoPath }` );
+			execSync( 'pnpm install --filter woocommerce', {
+				cwd: tmpRepoPath,
+				stdio: 'inherit',
+			} );
+		}
+
+		const releaseBranch = `release/${ version }`;
+
+		// Update the release branch.
+		const releaseBranchChanges = await updateReleaseBranchChangelogs(
+			options,
+			tmpRepoPath,
+			releaseBranch
+		);
+
+		// Update trunk.
+		await updateTrunkChangelog(
+			options,
+			tmpRepoPath,
+			releaseBranch,
+			releaseBranchChanges
+		);
+	} );
diff --git a/tools/monorepo-utils/src/code-freeze/commands/changelog/lib/index.ts b/tools/monorepo-utils/src/code-freeze/commands/changelog/lib/index.ts
new file mode 100644
index 00000000000..3434f0e0f13
--- /dev/null
+++ b/tools/monorepo-utils/src/code-freeze/commands/changelog/lib/index.ts
@@ -0,0 +1,204 @@
+/**
+ * External dependencies
+ */
+import simpleGit from 'simple-git';
+import { execSync } from 'child_process';
+import { readFile, writeFile } from 'fs/promises';
+import path from 'path';
+
+/**
+ * Internal dependencies
+ */
+import { Logger } from '../../../../core/logger';
+import { checkoutRemoteBranch } from '../../../../core/git';
+import { createPullRequest } from '../../../../core/github/repo';
+import { Options } from '../types';
+import { getToday } from '../../verify-day/utils';
+
+/**
+ * Perform changelog adjustments after Jetpack Changelogger has run.
+ *
+ * @param {string} override    Time override.
+ * @param {string} tmpRepoPath Path where the temporary repo is cloned.
+ */
+const updateReleaseChangelogs = async (
+	override: string,
+	tmpRepoPath: string
+) => {
+	const today = getToday( override );
+
+	// The release date is 22 days after the code freeze.
+	const releaseTime = new Date( today.getTime() + 22 * 24 * 60 * 60 * 1000 );
+	const releaseDate = releaseTime.toISOString().split( 'T' )[ 0 ];
+
+	const readmeFile = path.join(
+		tmpRepoPath,
+		'plugins',
+		'woocommerce',
+		'readme.txt'
+	);
+	const nextLogFile = path.join(
+		tmpRepoPath,
+		'plugins',
+		'woocommerce',
+		'NEXT_CHANGELOG.md'
+	);
+
+	let readme = await readFile( readmeFile, 'utf-8' );
+	let nextLog = await readFile( nextLogFile, 'utf-8' );
+
+	nextLog = nextLog.replace(
+		/= (\d+\.\d+\.\d+) YYYY-mm-dd =/,
+		`= $1 ${ releaseDate } =`
+	);
+
+	// Convert PR number to markdown link.
+	nextLog = nextLog.replace(
+		/\[#(\d+)\]/g,
+		'[$&](https://github.com/woocommerce/woocommerce/pull/$1)'
+	);
+
+	readme = readme.replace(
+		/== Changelog ==\n(.*?)\[See changelog for all versions\]/s,
+		`== Changelog ==\n\n${ nextLog }\n\n[See changelog for all versions]`
+	);
+
+	await writeFile( readmeFile, readme );
+};
+
+/**
+ * Perform changelog operations on release branch by submitting a pull request. The release branch is a remote branch.
+ *
+ * @param {Object} options       CLI options
+ * @param {string} tmpRepoPath   temp repo path
+ * @param {string} releaseBranch release branch name. The release branch is a remote branch on Github.
+ * @return {Object} update data
+ */
+export const updateReleaseBranchChangelogs = async (
+	options: Options,
+	tmpRepoPath: string,
+	releaseBranch: string
+): Promise< { deletionCommitHash: string; prNumber: number } > => {
+	const { owner, name, version } = options;
+	try {
+		await checkoutRemoteBranch( tmpRepoPath, releaseBranch );
+	} catch ( e ) {
+		if ( e.message.includes( "couldn't find remote ref" ) ) {
+			Logger.error(
+				`${ releaseBranch } does not exist on ${ owner }/${ name }.`
+			);
+		}
+		Logger.error( e );
+	}
+
+	const git = simpleGit( {
+		baseDir: tmpRepoPath,
+		config: [ 'core.hooksPath=/dev/null' ],
+	} );
+
+	const branch = `update/${ version }-changelog`;
+
+	try {
+		await git.checkout( {
+			'-b': null,
+			[ branch ]: null,
+		} );
+
+		Logger.notice( `Running the changelog script in ${ tmpRepoPath }` );
+		execSync(
+			`pnpm --filter=woocommerce run changelog write --add-pr-num -n -vvv --use-version ${ version }`,
+			{
+				cwd: tmpRepoPath,
+				stdio: 'inherit',
+			}
+		);
+		Logger.notice( `Committing deleted files in ${ tmpRepoPath }` );
+		//Checkout pnpm-lock.yaml to prevent issues in case of an out of date lockfile.
+		await git.checkout( 'pnpm-lock.yaml' );
+		await git.add( 'plugins/woocommerce/changelog/' );
+		await git.commit( `Delete changelog files from ${ version } release` );
+		const deletionCommitHash = await git.raw( [ 'rev-parse', 'HEAD' ] );
+		Logger.notice( `git deletion hash: ${ deletionCommitHash }` );
+
+		Logger.notice( `Updating readme.txt in ${ tmpRepoPath }` );
+		await updateReleaseChangelogs( options.override, tmpRepoPath );
+
+		Logger.notice(
+			`Committing readme.txt changes in ${ branch } on ${ tmpRepoPath }`
+		);
+		await git.add( 'plugins/woocommerce/readme.txt' );
+		await git.commit(
+			`Update the readme files for the ${ version } release`
+		);
+		await git.push( 'origin', branch );
+		await git.checkout( '.' );
+
+		Logger.notice( `Creating PR for ${ branch }` );
+		const pullRequest = await createPullRequest( {
+			owner,
+			name,
+			title: `Release: Prepare the changelog for ${ version }`,
+			body: `This pull request was automatically generated during the code freeze to prepare the changelog for ${ version }`,
+			head: branch,
+			base: releaseBranch,
+		} );
+		Logger.notice( `Pull request created: ${ pullRequest.html_url }` );
+		return {
+			deletionCommitHash: deletionCommitHash.trim(),
+			prNumber: pullRequest.number,
+		};
+	} catch ( e ) {
+		Logger.error( e );
+	}
+};
+
+/**
+ * Perform changelog operations on trunk by submitting a pull request.
+ *
+ * @param {Object} options                                 CLI options
+ * @param {string} tmpRepoPath                             temp repo path
+ * @param {string} releaseBranch                           release branch name
+ * @param {Object} releaseBranchChanges                    update data from updateReleaseBranchChangelogs
+ * @param {Object} releaseBranchChanges.deletionCommitHash commit from the changelog deletions in updateReleaseBranchChangelogs
+ * @param {Object} releaseBranchChanges.prNumber           pr number created in updateReleaseBranchChangelogs
+ */
+export const updateTrunkChangelog = async (
+	options: Options,
+	tmpRepoPath: string,
+	releaseBranch: string,
+	releaseBranchChanges: { deletionCommitHash: string; prNumber: number }
+): Promise< void > => {
+	const { owner, name, version } = options;
+	const { deletionCommitHash, prNumber } = releaseBranchChanges;
+	Logger.notice( `Deleting changelogs from trunk ${ tmpRepoPath }` );
+	const git = simpleGit( {
+		baseDir: tmpRepoPath,
+		config: [ 'core.hooksPath=/dev/null' ],
+	} );
+
+	try {
+		await git.checkout( 'trunk' );
+		const branch = `delete/${ version }-changelog`;
+		Logger.notice(
+			`Committing deletions in ${ branch } on ${ tmpRepoPath }`
+		);
+		await git.checkout( {
+			'-b': null,
+			[ branch ]: null,
+		} );
+		await git.raw( [ 'cherry-pick', deletionCommitHash ] );
+		await git.push( 'origin', branch );
+		Logger.notice( `Creating PR for ${ branch }` );
+		const pullRequest = await createPullRequest( {
+			owner,
+			name,
+			title: `Release: Remove ${ version } change files`,
+			body: `This pull request was automatically generated during the code freeze to remove the changefiles from ${ version } that are compiled into the \`${ releaseBranch }\` branch via #${ prNumber }`,
+			head: branch,
+			base: 'trunk',
+		} );
+		Logger.notice( `Pull request created: ${ pullRequest.html_url }` );
+	} catch ( e ) {
+		Logger.error( e );
+	}
+};
diff --git a/tools/monorepo-utils/src/code-freeze/commands/changelog/types.ts b/tools/monorepo-utils/src/code-freeze/commands/changelog/types.ts
new file mode 100644
index 00000000000..95ba3a7fb55
--- /dev/null
+++ b/tools/monorepo-utils/src/code-freeze/commands/changelog/types.ts
@@ -0,0 +1,7 @@
+export type Options = {
+	owner: string;
+	name: string;
+	version: string;
+	devRepoPath?: string;
+	override: string;
+};
diff --git a/tools/monorepo-utils/src/code-freeze/commands/index.ts b/tools/monorepo-utils/src/code-freeze/commands/index.ts
index a09204c1d4f..dee3e3d4b70 100644
--- a/tools/monorepo-utils/src/code-freeze/commands/index.ts
+++ b/tools/monorepo-utils/src/code-freeze/commands/index.ts
@@ -10,12 +10,14 @@ import { verifyDayCommand } from './verify-day';
 import { milestoneCommand } from './milestone';
 import { branchCommand } from './branch';
 import { versionBumpCommand } from './version-bump';
+import { changelogCommand } from './changelog';
 
 const program = new Command( 'code-freeze' )
 	.description( 'Code freeze utilities' )
 	.addCommand( verifyDayCommand )
 	.addCommand( milestoneCommand )
 	.addCommand( branchCommand )
-	.addCommand( versionBumpCommand );
+	.addCommand( versionBumpCommand )
+	.addCommand( changelogCommand );
 
 export default program;
diff --git a/tools/monorepo-utils/src/code-freeze/commands/milestone/index.ts b/tools/monorepo-utils/src/code-freeze/commands/milestone/index.ts
index a42e50b5074..7e2e04488d8 100644
--- a/tools/monorepo-utils/src/code-freeze/commands/milestone/index.ts
+++ b/tools/monorepo-utils/src/code-freeze/commands/milestone/index.ts
@@ -11,9 +11,8 @@ import { getLatestGithubReleaseVersion } from '../../../core/github/repo';
 import { octokitWithAuth } from '../../../core/github/api';
 import { setGithubMilestoneOutputs } from './utils';
 import { WPIncrement } from '../../../core/version';
-import { Options } from './types';
 import { Logger } from '../../../core/logger';
-import { getEnvVar } from '../../../core/environment';
+import { isGithubCI } from '../../../core/environment';
 
 export const milestoneCommand = new Command( 'milestone' )
 	.description( 'Create a milestone' )
@@ -32,9 +31,9 @@ export const milestoneCommand = new Command( 'milestone' )
 		'-m --milestone <milestone>',
 		'Milestone to create. Next milestone is gathered from Github if none is supplied'
 	)
-	.action( async ( options: Options ) => {
+	.action( async ( options ) => {
 		const { owner, name, dryRun, milestone } = options;
-		const isGithub = getEnvVar( 'CI' );
+		const isGithub = isGithubCI();
 
 		if ( milestone && isGithub ) {
 			Logger.error(
@@ -90,7 +89,7 @@ export const milestoneCommand = new Command( 'milestone' )
 		}
 
 		try {
-			await octokitWithAuth.request(
+			await octokitWithAuth().request(
 				`POST /repos/${ owner }/${ name }/milestones`,
 				{
 					title: nextMilestone,
diff --git a/tools/monorepo-utils/src/code-freeze/commands/milestone/types.ts b/tools/monorepo-utils/src/code-freeze/commands/milestone/types.ts
deleted file mode 100644
index 0555aa7a4aa..00000000000
--- a/tools/monorepo-utils/src/code-freeze/commands/milestone/types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type Options = {
-	github?: boolean;
-	dryRun?: boolean;
-	owner?: string;
-	name?: string;
-	milestone?: string;
-};
diff --git a/tools/monorepo-utils/src/code-freeze/commands/verify-day/index.ts b/tools/monorepo-utils/src/code-freeze/commands/verify-day/index.ts
index 4b088a3a23a..7a8930303f2 100644
--- a/tools/monorepo-utils/src/code-freeze/commands/verify-day/index.ts
+++ b/tools/monorepo-utils/src/code-freeze/commands/verify-day/index.ts
@@ -14,13 +14,14 @@ import {
 	getFutureDate,
 } from './utils';
 import { Logger } from '../../../core/logger';
-import { getEnvVar } from '../../../core/environment';
+import { isGithubCI } from '../../../core/environment';
 
 export const verifyDayCommand = new Command( 'verify-day' )
 	.description( 'Verify if today is the code freeze day' )
 	.option(
 		'-o, --override <override>',
-		"Time Override: The time to use in checking whether the action should run (default: 'now')."
+		"Time Override: The time to use in checking whether the action should run (default: 'now').",
+		'now'
 	)
 	.action( ( { override } ) => {
 		const today = getToday( override );
@@ -39,7 +40,7 @@ export const verifyDayCommand = new Command( 'verify-day' )
 			`Today is ${ isCodeFreezeDay ? 'indeed' : 'not' } code freeze day.`
 		);
 
-		if ( getEnvVar( 'CI' ) ) {
+		if ( isGithubCI() ) {
 			setOutput( 'freeze', isCodeFreezeDay.toString() );
 		}
 
diff --git a/tools/monorepo-utils/src/code-freeze/commands/version-bump/index.ts b/tools/monorepo-utils/src/code-freeze/commands/version-bump/index.ts
index aeb601c675d..6964c2ae352 100644
--- a/tools/monorepo-utils/src/code-freeze/commands/version-bump/index.ts
+++ b/tools/monorepo-utils/src/code-freeze/commands/version-bump/index.ts
@@ -9,7 +9,7 @@ import simpleGit from 'simple-git';
  */
 import { Logger } from '../../../core/logger';
 import { sparseCheckoutRepoShallow } from '../../../core/git';
-import { octokitWithAuth } from '../../../core/github/api';
+import { createPullRequest } from '../../../core/github/repo';
 import { getEnvVar } from '../../../core/environment';
 import { getMajorMinor } from '../../../core/version';
 import { bumpFiles } from './bump';
@@ -101,18 +101,16 @@ export const versionBumpCommand = new Command( 'version-bump' )
 
 		try {
 			Logger.startTask( 'Creating a pull request' );
-			const pr = await octokitWithAuth.request(
-				'POST /repos/{owner}/{repo}/pulls',
-				{
-					owner,
-					repo: name,
-					title: `Prep trunk for ${ majorMinor } cycle`,
-					body: `This PR updates the versions in trunk to ${ version } for next development cycle.`,
-					head: branch,
-					base,
-				}
-			);
-			Logger.notice( `Pull request created: ${ pr.data.html_url }` );
+
+			const pullRequest = await createPullRequest( {
+				owner,
+				name,
+				title: `Prep trunk for ${ majorMinor } cycle`,
+				body: `This PR updates the versions in trunk to ${ version } for next development cycle.`,
+				head: branch,
+				base,
+			} );
+			Logger.notice( `Pull request created: ${ pullRequest.html_url }` );
 			Logger.endTask();
 		} catch ( e ) {
 			Logger.error( e );
diff --git a/tools/monorepo-utils/src/core/__tests__/environment.ts b/tools/monorepo-utils/src/core/__tests__/environment.ts
new file mode 100644
index 00000000000..9ccf5d54660
--- /dev/null
+++ b/tools/monorepo-utils/src/core/__tests__/environment.ts
@@ -0,0 +1,25 @@
+/**
+ * Internal dependencies
+ */
+import { isGithubCI } from '../environment';
+
+describe( 'isGithubCI', () => {
+	it( 'should return true if GITHUB_ACTIONS is true', () => {
+		process.env.GITHUB_ACTIONS = 'true';
+		expect( isGithubCI() ).toBe( true );
+	} );
+
+	it( 'should return false if GITHUB_ACTIONS is false', () => {
+		process.env.GITHUB_ACTIONS = 'false';
+		expect( isGithubCI() ).toBe( false );
+	} );
+
+	it( 'should return false if GITHUB_ACTIONS is not set', () => {
+		process.env.GITHUB_ACTIONS = undefined;
+		expect( isGithubCI() ).toBe( false );
+	} );
+
+	afterAll( () => {
+		delete process.env.GITHUB_ACTIONS;
+	} );
+} );
diff --git a/tools/monorepo-utils/src/core/__tests__/logger.ts b/tools/monorepo-utils/src/core/__tests__/logger.ts
new file mode 100644
index 00000000000..58dc92454d1
--- /dev/null
+++ b/tools/monorepo-utils/src/core/__tests__/logger.ts
@@ -0,0 +1,71 @@
+jest.spyOn( global.console, 'error' ).mockImplementation( () => {} );
+// @ts-expect-error -- We're mocking process exit, it has never return type!
+jest.spyOn( global.process, 'exit' ).mockImplementation( () => {} );
+
+/**
+ * External dependencies
+ */
+import chalk from 'chalk';
+
+/**
+ * Internal dependencies
+ */
+import { Logger } from '../logger';
+
+describe( 'Logger', () => {
+	afterEach( () => {
+		jest.resetAllMocks();
+	} );
+
+	describe( 'error', () => {
+		process.env.LOGGER_LEVEL = 'error';
+
+		it( 'should log a message for string messages', () => {
+			const message = 'test message';
+
+			Logger.error( message );
+
+			expect( global.console.error ).toHaveBeenCalledWith(
+				chalk.red( message )
+			);
+		} );
+
+		it( 'should log a message for errors', () => {
+			const error = new Error( 'test error' );
+
+			Logger.error( error );
+
+			expect( global.console.error ).toHaveBeenCalledWith(
+				chalk.red( `${ error.message }\n${ error.stack }` )
+			);
+		} );
+
+		it( 'should json stringify for unknown types', () => {
+			Logger.error( { foo: 'bar' } );
+
+			expect( global.console.error ).toHaveBeenCalledWith(
+				chalk.red( JSON.stringify( { foo: 'bar' }, null, 2 ) )
+			);
+		} );
+
+		it( 'should call process.exit by default', () => {
+			Logger.error( 'test message' );
+
+			expect( global.process.exit ).toHaveBeenCalledWith( 1 );
+		} );
+
+		it( 'should not call process.exit when failOnErr is false', () => {
+			Logger.error( 'test message', false );
+
+			expect( global.process.exit ).not.toHaveBeenCalled();
+		} );
+
+		it( 'should not log errors if the Logger is in silent mode', () => {
+			process.env.LOGGER_LEVEL = 'silent';
+
+			Logger.error( 'test message' );
+
+			expect( global.console.error ).not.toHaveBeenCalled();
+		} );
+	} );
+} );
diff --git a/tools/monorepo-utils/src/core/environment.ts b/tools/monorepo-utils/src/core/environment.ts
index 29b1c2df864..47c366d9751 100644
--- a/tools/monorepo-utils/src/core/environment.ts
+++ b/tools/monorepo-utils/src/core/environment.ts
@@ -14,3 +14,7 @@ export const getEnvVar = ( varName: string, isRequired = false ) => {
 
 	return value || '';
 };
+
+export const isGithubCI = () => {
+	return process.env.GITHUB_ACTIONS === 'true';
+};
diff --git a/tools/monorepo-utils/src/core/git.ts b/tools/monorepo-utils/src/core/git.ts
index e07a409f359..19a46e64eff 100644
--- a/tools/monorepo-utils/src/core/git.ts
+++ b/tools/monorepo-utils/src/core/git.ts
@@ -10,6 +10,11 @@ import { v4 } from 'uuid';
 import { mkdir, rm } from 'fs/promises';
 import { URL } from 'node:url';
 
+/**
+ * Internal dependencies
+ */
+import { getEnvVar } from './environment';
+
 /**
  * Get filename from patch
  *
@@ -110,6 +115,29 @@ export const cloneRepoShallow = async ( repoPath: string ) => {
 	return await cloneRepo( repoPath, { '--depth': 1 } );
 };
 
+/**
+ * Clone a repo using the authenticated token `GITHUB_TOKEN`. This allows the script to push branches to origin.
+ *
+ * @param {Object}  options       CLI options
+ * @param {string}  options.owner repo owner
+ * @param {string}  options.name  repo name
+ * @param {boolean} isShallow     whether to do a shallow clone or not.
+ * @return {string} temporary repo path
+ */
+export const cloneAuthenticatedRepo = async (
+	options: { owner: string; name: string },
+	isShallow = true
+): Promise< string > => {
+	const { owner, name } = options;
+	const source = `github.com/${ owner }/${ name }`;
+	const token = getEnvVar( 'GITHUB_TOKEN' );
+	const remote = `https://${ owner }:${ token }@${ source }`;
+
+	return isShallow
+		? await cloneRepoShallow( remote )
+		: await cloneRepo( remote );
+};
+
 /**
  * Do a minimal sparse checkout of a github repo.
  *
@@ -391,3 +419,23 @@ export const generateDiff = async (
 		return '';
 	}
 };
+
+/**
+ *
+ * @param {string} tmpRepoPath path to temporary repo
+ * @param {string} branch      remote branch to checkout
+ */
+export const checkoutRemoteBranch = async (
+	tmpRepoPath: string,
+	branch: string
+): Promise< void > => {
+	const git = simpleGit( {
+		baseDir: tmpRepoPath,
+		config: [ 'core.hooksPath=/dev/null' ],
+	} );
+
+	// When the clone is shallow, we need to call this before fetching.
+	await git.raw( [ 'remote', 'set-branches', '--add', 'origin', branch ] );
+	await git.raw( [ 'fetch', 'origin', branch ] );
+	await git.raw( [ 'checkout', '-b', branch, `origin/${ branch }` ] );
+};
diff --git a/tools/monorepo-utils/src/core/github/__tests__/index.ts b/tools/monorepo-utils/src/core/github/__tests__/index.ts
index 0d47d19a253..1a9f7b3a630 100644
--- a/tools/monorepo-utils/src/core/github/__tests__/index.ts
+++ b/tools/monorepo-utils/src/core/github/__tests__/index.ts
@@ -5,46 +5,47 @@ import { getLatestGithubReleaseVersion } from '../repo';
 
 jest.mock( '../api', () => {
 	return {
-		graphqlWithAuth: jest.fn().mockResolvedValue( {
-			repository: {
-				releases: {
-					nodes: [
-						{
-							tagName: 'nightly',
-							isLatest: false,
-						},
-						{
-							tagName: 'wc-beta-tester-99.99.0',
-							isLatest: false,
-						},
-						{
-							tagName: '1.0.0',
-							isLatest: false,
-						},
-						{
-							tagName: '1.1.0',
-							isLatest: false,
-						},
-						{
-							tagName: '1.2.0',
-							isLatest: false,
-						},
-						{
-							tagName: '2.0.0',
-							isLatest: false,
-						},
-						{
-							tagName: '2.0.1',
-							isLatest: true,
-						},
-						{
-							tagName: '1.0.1',
-							isLatest: false,
-						},
-					],
+		graphqlWithAuth: () =>
+			jest.fn().mockResolvedValue( {
+				repository: {
+					releases: {
+						nodes: [
+							{
+								tagName: 'nightly',
+								isLatest: false,
+							},
+							{
+								tagName: 'wc-beta-tester-99.99.0',
+								isLatest: false,
+							},
+							{
+								tagName: '1.0.0',
+								isLatest: false,
+							},
+							{
+								tagName: '1.1.0',
+								isLatest: false,
+							},
+							{
+								tagName: '1.2.0',
+								isLatest: false,
+							},
+							{
+								tagName: '2.0.0',
+								isLatest: false,
+							},
+							{
+								tagName: '2.0.1',
+								isLatest: true,
+							},
+							{
+								tagName: '1.0.1',
+								isLatest: false,
+							},
+						],
+					},
 				},
-			},
-		} ),
+			} ),
 	};
 } );
 
diff --git a/tools/monorepo-utils/src/core/github/api.ts b/tools/monorepo-utils/src/core/github/api.ts
index 8405e9301d3..8a2332cc0ac 100644
--- a/tools/monorepo-utils/src/core/github/api.ts
+++ b/tools/monorepo-utils/src/core/github/api.ts
@@ -1,15 +1,52 @@
 /**
  * External dependencies
  */
-import { graphql } from '@octokit/graphql';
+import { graphql as gql } from '@octokit/graphql';
 import { Octokit } from 'octokit';
+import { graphql } from '@octokit/graphql/dist-types/types';
 
-export const graphqlWithAuth = graphql.defaults( {
-	headers: {
-		authorization: `Bearer ${ process.env.GITHUB_TOKEN }`,
-	},
-} );
+/**
+ * Internal dependencies
+ */
+import { getEnvVar } from '../environment';
 
-export const octokitWithAuth = new Octokit( {
-	auth: process.env.GITHUB_TOKEN,
-} );
+let graphqlWithAuthInstance;
+let octokitWithAuthInstance;
+
+/**
+ * Returns a graphql instance with auth headers, throws an Exception if
+ * `GITHUB_TOKEN` env var is not present.
+ *
+ * @return graphql instance
+ */
+export const graphqlWithAuth = (): graphql => {
+	if ( graphqlWithAuthInstance ) {
+		return graphqlWithAuthInstance;
+	}
+
+	graphqlWithAuthInstance = gql.defaults( {
+		headers: {
+			authorization: `Bearer ${ getEnvVar( 'GITHUB_TOKEN', true ) }`,
+		},
+	} );
+
+	return graphqlWithAuthInstance;
+};
+
+/**
+ * Returns an Octokit instance with auth headers, throws an Exception if
+ * `GITHUB_TOKEN` env var is not present.
+ *
+ * @return graphql instance
+ */
+export const octokitWithAuth = (): Octokit => {
+	if ( octokitWithAuthInstance ) {
+		return octokitWithAuthInstance;
+	}
+
+	octokitWithAuthInstance = new Octokit( {
+		auth: getEnvVar( 'GITHUB_TOKEN', true ),
+	} );
+
+	return octokitWithAuthInstance;
+};
diff --git a/tools/monorepo-utils/src/core/github/repo.ts b/tools/monorepo-utils/src/core/github/repo.ts
index 17ff1e2608e..4ebaee35bd7 100644
--- a/tools/monorepo-utils/src/core/github/repo.ts
+++ b/tools/monorepo-utils/src/core/github/repo.ts
@@ -7,6 +7,10 @@ import { Repository } from '@octokit/graphql-schema';
  * Internal dependencies
  */
 import { graphqlWithAuth, octokitWithAuth } from './api';
+import {
+	CreatePullRequestEndpointResponse,
+	GetPullRequestEndpointResponse,
+} from './types';
 
 export const getLatestGithubReleaseVersion = async ( options: {
 	owner?: string;
@@ -14,7 +18,7 @@ export const getLatestGithubReleaseVersion = async ( options: {
 } ): Promise< string > => {
 	const { owner, name } = options;
 
-	const data = await graphqlWithAuth< { repository: Repository } >( `
+	const data = await graphqlWithAuth()< { repository: Repository } >( `
 			{
 			    repository(owner: "${ owner }", name: "${ name }") {
 					releases(
@@ -43,8 +47,9 @@ export const doesGithubBranchExist = async (
 	nextReleaseBranch: string
 ): Promise< boolean > => {
 	const { owner, name } = options;
+
 	try {
-		const branchOnGithub = await octokitWithAuth.request(
+		const branchOnGithub = await octokitWithAuth().request(
 			'GET /repos/{owner}/{repo}/branches/{branch}',
 			{
 				owner,
@@ -72,7 +77,7 @@ export const getRefFromGithubBranch = async (
 	source: string
 ): Promise< string > => {
 	const { owner, name } = options;
-	const { repository } = await graphqlWithAuth< {
+	const { repository } = await graphqlWithAuth()< {
 		repository: Repository;
 	} >( `
 			{
@@ -103,7 +108,7 @@ export const createGithubBranch = async (
 	ref: string
 ): Promise< void > => {
 	const { owner, name } = options;
-	await octokitWithAuth.request( 'POST /repos/{owner}/{repo}/git/refs', {
+	await octokitWithAuth().request( 'POST /repos/{owner}/{repo}/git/refs', {
 		owner,
 		repo: name,
 		ref: `refs/heads/${ branch }`,
@@ -119,7 +124,7 @@ export const deleteGithubBranch = async (
 	branch: string
 ): Promise< void > => {
 	const { owner, name } = options;
-	await octokitWithAuth.request(
+	await octokitWithAuth().request(
 		'DELETE /repos/{owner}/{repo}/git/refs/heads/{ref}',
 		{
 			owner,
@@ -128,3 +133,89 @@ export const deleteGithubBranch = async (
 		}
 	);
 };
+
+/**
+ * Create a pull request from branches on Github.
+ *
+ * @param {Object} options       pull request options.
+ * @param {string} options.head  branch name containing the changes you want to merge.
+ * @param {string} options.base  branch name you want the changes pulled into.
+ * @param {string} options.owner repository owner.
+ * @param {string} options.name  repository name.
+ * @param {string} options.title pull request title.
+ * @param {string} options.body  pull request body.
+ * @return {Promise<object>}     pull request data.
+ */
+export const createPullRequest = async ( options: {
+	head: string;
+	base: string;
+	owner: string;
+	name: string;
+	title: string;
+	body: string;
+} ): Promise< CreatePullRequestEndpointResponse[ 'data' ] > => {
+	const { head, base, owner, name, title, body } = options;
+	const pullRequest = await octokitWithAuth().request(
+		'POST /repos/{owner}/{repo}/pulls',
+		{
+			owner,
+			repo: name,
+			title,
+			body,
+			head,
+			base,
+		}
+	);
+
+	//@ts-ignore There is a type mismatch between the graphql schema and the response. pullRequest.data.head.repo.has_discussions is a boolean, but the graphql schema doesn't have that field.
+	return pullRequest.data;
+};
+
+/**
+ * Get a pull request from GitHub.
+ *
+ * @param {Object} options
+ * @param {string} options.owner repository owner.
+ * @param {string} options.name  repository name.
+ * @param          prNumber      pull request number.
+ * @return {Promise<object>}     pull request data.
+ */
+export const getPullRequest = async ( options: {
+	owner: string;
+	name: string;
+	prNumber: string;
+} ): Promise< GetPullRequestEndpointResponse[ 'data' ] > => {
+	const { owner, name, prNumber } = options;
+	const pr = await octokitWithAuth().request(
+		'GET /repos/{owner}/{repo}/pulls/{pull_number}',
+		{
+			owner,
+			repo: name,
+			pull_number: Number( prNumber ),
+		}
+	);
+
+	//@ts-ignore Not sure why this error comes up. All versions are up to date and the schema is correct.
+	return pr.data;
+};
+
+/**
+ * Determine if a pull request is coming from a community contribution, i.e., not from a member of the WooCommerce organization.
+ *
+ * @param {Object} pullRequestData pull request data.
+ * @param {string} owner           repository owner.
+ * @param {string} name            repository name.
+ * @return {boolean} if a pull request is coming from a community contribution.
+ */
+export const isCommunityPullRequest = (
+	pullRequestData: GetPullRequestEndpointResponse[ 'data' ],
+	owner: string,
+	name: string
+) => {
+	return (
+		pullRequestData.author_association === 'CONTRIBUTOR' ||
+		// It's possible a MEMBER can open a PR from their own fork.
+		( pullRequestData.author_association === 'MEMBER' &&
+			pullRequestData.head.repo.full_name !== `${ owner }/${ name }` )
+	);
+};
diff --git a/tools/monorepo-utils/src/core/github/types.ts b/tools/monorepo-utils/src/core/github/types.ts
new file mode 100644
index 00000000000..a0d373830fe
--- /dev/null
+++ b/tools/monorepo-utils/src/core/github/types.ts
@@ -0,0 +1,10 @@
+/**
+ * External dependencies
+ */
+import { Endpoints } from '@octokit/types';
+
+export type CreatePullRequestEndpointResponse =
+	Endpoints[ 'POST /repos/{owner}/{repo}/pulls' ][ 'response' ];
+
+export type GetPullRequestEndpointResponse =
+	Endpoints[ 'GET /repos/{owner}/{repo}/pulls/{pull_number}' ][ 'response' ];
diff --git a/tools/monorepo-utils/src/core/logger.ts b/tools/monorepo-utils/src/core/logger.ts
index 6fff23c1288..e2fa03c5585 100644
--- a/tools/monorepo-utils/src/core/logger.ts
+++ b/tools/monorepo-utils/src/core/logger.ts
@@ -7,7 +7,7 @@ import chalk from 'chalk';
 /**
  * Internal dependencies
  */
-import { getEnvVar } from './environment';
+import { getEnvVar, isGithubCI } from './environment';
 
 const LOGGING_LEVELS: Record< string, number > = {
 	verbose: 3,
@@ -25,10 +25,20 @@ export class Logger {
 		] as number;
 	}
 
-	static error( message: string ) {
+	static error( err: unknown, failOnErr = true ) {
 		if ( Logger.loggingLevel >= LOGGING_LEVELS.error ) {
-			error( chalk.red( message ) );
-			process.exit( 1 );
+			if ( err instanceof Error ) {
+				error( chalk.red( `${ err.message }\n${ err.stack }` ) );
+			} else if ( typeof err === 'string' ) {
+				error( chalk.red( err ) );
+			} else {
+				// Best effort to log the error when we don't know the type.
+				error( chalk.red( JSON.stringify( err, null, 2 ) ) );
+			}
+
+			if ( failOnErr ) {
+				process.exit( 1 );
+			}
 		}
 	}
 
@@ -45,21 +55,26 @@ export class Logger {
 	}
 
 	static startTask( message: string ) {
-		if ( Logger.loggingLevel > LOGGING_LEVELS.silent ) {
+		if ( Logger.loggingLevel > LOGGING_LEVELS.silent && ! isGithubCI() ) {
 			const spinner = ora( chalk.green( `${ message }...` ) ).start();
 			Logger.lastSpinner = spinner;
+		} else if ( isGithubCI() ) {
+			Logger.notice( message );
 		}
 	}
 
 	static endTask() {
 		if (
 			Logger.loggingLevel > LOGGING_LEVELS.silent &&
-			Logger.lastSpinner
+			Logger.lastSpinner &&
+			! isGithubCI()
 		) {
 			Logger.lastSpinner.succeed(
 				`${ Logger.lastSpinner.text } complete.`
 			);
 			Logger.lastSpinner = null;
+		} else if ( isGithubCI() ) {
+			Logger.notice( 'Task complete.' );
 		}
 	}
 }
diff --git a/tools/monorepo-utils/src/core/util.ts b/tools/monorepo-utils/src/core/util.ts
index 4c7b5e9648a..48582e0abb4 100644
--- a/tools/monorepo-utils/src/core/util.ts
+++ b/tools/monorepo-utils/src/core/util.ts
@@ -3,5 +3,48 @@
  */
 import { promisify } from 'util';
 import { exec } from 'child_process';
+import { RequestOptions, request } from 'https';
+import { IncomingMessage } from 'http';
 
 export const execAsync = promisify( exec );
+
+// Map just the raw value types of IncomingMessage to a new type for the response which includes a body string.
+type HttpsResponse = {
+	// I think it's fine to use this type this way just to exclude functions from the IncomingMessage type.
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	[ K in keyof IncomingMessage as IncomingMessage[ K ] extends Function
+		? never
+		: K ]: IncomingMessage[ K ];
+} & {
+	body: string;
+};
+
+// A wrapper around https.request that returns a promise encapulating the response body and other response attributes.
+export const requestAsync = (
+	options: string | RequestOptions | URL,
+	data?: string | Uint8Array | Buffer
+) => {
+	return new Promise< HttpsResponse >( ( resolve, reject ) => {
+		const req = request( options, ( res ) => {
+			let body = '';
+			res.setEncoding( 'utf8' );
+			res.on( 'data', ( chunk ) => {
+				body += chunk;
+			} );
+			res.on( 'end', () => {
+				const httpsResponse: HttpsResponse = {
+					...res,
+					body,
+				};
+				resolve( httpsResponse );
+			} );
+		} );
+		req.on( 'error', ( err ) => {
+			reject( err );
+		} );
+		if ( data ) {
+			req.write( data );
+		}
+		req.end();
+	} );
+};
diff --git a/tools/monorepo-utils/src/index.ts b/tools/monorepo-utils/src/index.ts
index be0d18c2ff9..6ff8adf6065 100755
--- a/tools/monorepo-utils/src/index.ts
+++ b/tools/monorepo-utils/src/index.ts
@@ -9,12 +9,41 @@ import chalk from 'chalk';
  * Internal dependencies
  */
 import CodeFreeze from './code-freeze/commands';
+import Slack from './slack/commands/slack';
+import Changefile from './changefile';
+import { Logger } from './core/logger';
+import { isGithubCI } from './core/environment';
 
-console.log(
-	chalk.rgb( 150, 88, 138 ).bold( figlet.textSync( 'WooCommerce Utilities' ) )
-);
+if ( ! isGithubCI() ) {
+	Logger.notice(
+		chalk
+			.rgb( 150, 88, 138 )
+			.bold( figlet.textSync( 'WooCommerce \n Utils' ) )
+	);
+}
 
-export const program = new Command()
+const program = new Command()
 	.name( 'utils' )
 	.description( 'Monorepo utilities' )
-	.addCommand( CodeFreeze );
+	.addCommand( CodeFreeze )
+	.addCommand( Slack )
+	.addCommand( Changefile );
+
+program.exitOverride();
+
+const run = async () => {
+	try {
+		//  parseAsync handles cases where the action is async and not async.
+		await program.parseAsync( process.argv );
+	} catch ( e ) {
+		// if github ci, always error
+		if ( isGithubCI() ) {
+			Logger.error( e );
+		} else if ( e.code !== 'commander.help' ) {
+			// if not github ci, only error if not help
+			Logger.error( e );
+		}
+	}
+};
+
+run();
diff --git a/tools/monorepo-utils/src/slack/README.md b/tools/monorepo-utils/src/slack/README.md
new file mode 100644
index 00000000000..1ea5bf83531
--- /dev/null
+++ b/tools/monorepo-utils/src/slack/README.md
@@ -0,0 +1,5 @@
+# Slack Utilities
+
+Utilities for automated posting to Slack.
+
+To see available commands run `pnpm utils slack --help` from the project root.
diff --git a/tools/monorepo-utils/src/slack/commands/slack/index.ts b/tools/monorepo-utils/src/slack/commands/slack/index.ts
new file mode 100644
index 00000000000..934a0e7fdac
--- /dev/null
+++ b/tools/monorepo-utils/src/slack/commands/slack/index.ts
@@ -0,0 +1,19 @@
+/**
+ * External dependencies
+ */
+import { Command } from '@commander-js/extra-typings';
+
+/**
+ * Internal dependencies
+ */
+import { slackMessageCommand } from './slack-message';
+
+/**
+ * Internal dependencies
+ */
+
+const program = new Command( 'slack' )
+	.description( 'Slack message sending utilities' )
+	.addCommand( slackMessageCommand, { isDefault: true } );
+
+export default program;
diff --git a/tools/monorepo-utils/src/slack/commands/slack/slack-message.ts b/tools/monorepo-utils/src/slack/commands/slack/slack-message.ts
new file mode 100644
index 00000000000..9e4c141ede0
--- /dev/null
+++ b/tools/monorepo-utils/src/slack/commands/slack/slack-message.ts
@@ -0,0 +1,80 @@
+/**
+ * External dependencies
+ */
+import { Command } from '@commander-js/extra-typings';
+
+/**
+ * Internal dependencies
+ */
+import { Logger } from '../../../core/logger';
+import { requestAsync } from '../../../core/util';
+
+type SlackResponse = {
+	ok: boolean;
+	error?: string;
+};
+
+export const slackMessageCommand = new Command( 'message' )
+	.description( 'Send a plain-text message to a slack channel' )
+	.argument(
+		'<token>',
+		'Slack authentication token bearing required scopes.'
+	)
+	.argument( '<text>', 'Text based message to send to the slack channel.' )
+	.argument(
+		'<channels...>',
+		'Slack channels to send the message to. Pass as many as you like.'
+	)
+	.option(
+		'--dont-fail',
+		'Do not fail the command if a message fails to send to any channel.'
+	)
+	.action( async ( token, text, channels, { dontFail } ) => {
+		Logger.startTask(
+			`Attempting to send message to Slack for channels: ${ channels.join(
+				','
+			) }`
+		);
+
+		const shouldFail = ! dontFail;
+
+		for ( const channel of channels ) {
+			// Define the request options
+			const options = {
+				hostname: 'slack.com',
+				path: '/api/chat.postMessage',
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+					Authorization: `Bearer ${ token }`,
+				},
+			};
+
+			try {
+				const { statusCode, body } = await requestAsync(
+					options,
+					JSON.stringify( {
+						channel,
+						text: text.replace( /\\n/g, '\n' ),
+					} )
+				);
+
+				Logger.endTask();
+
+				const response = JSON.parse( body ) as SlackResponse;
+
+				if ( ! response.ok || statusCode !== 200 ) {
+					Logger.error(
+						`Slack API returned an error: ${ response?.error }, message failed to send to ${ channel }.`,
+						shouldFail
+					);
+				} else {
+					Logger.notice(
+						`Slack message sent successfully to channel: ${ channel }`
+					);
+				}
+			} catch ( e: unknown ) {
+				Logger.error( e, shouldFail );
+			}
+		}
+	} );
diff --git a/tools/monorepo/check-changelogger-use.php b/tools/monorepo/check-changelogger-use.php
index b9f07dd3c83..2c58f284178 100644
--- a/tools/monorepo/check-changelogger-use.php
+++ b/tools/monorepo/check-changelogger-use.php
@@ -216,7 +216,7 @@ foreach ( $touched_projects as $slug => $files ) {
 		} elseif ( getenv( 'CI' ) ) {
 			printf( "---\n" ); // Bracket message containing newlines for better visibility in GH's logs.
 			printf(
-				"::error::Project %s is being changed, but no change file in %s is touched!%%0A%%0AUse `pnpm --filter=%s run changelog add` to add a change file.\n",
+				"::error::Project %s is being changed, but no change file in %s is touched!\n\nUse `pnpm --filter=./%s run changelog add` to add a change file.\n",
 				$slug,
 				"$slug/{$changelogger_projects[ $slug ]['changes-dir']}/",
 				$slug
diff --git a/tools/storybook/wordpress/css/about-rtl.css b/tools/storybook/wordpress/css/about-rtl.css
index 2c5efe2afbd..39b9b1f92e6 100644
--- a/tools/storybook/wordpress/css/about-rtl.css
+++ b/tools/storybook/wordpress/css/about-rtl.css
@@ -287,7 +287,7 @@
 	grid-column-start: 4;
 }
 
-/* Any columns following a section header need to be expicitly put into the second row, for IE support. */
+/* Any columns following a section header need to be explicitly put into the second row, for IE support. */
 .about__section.has-2-columns .is-section-header ~ .column,
 .about__section.has-3-columns .is-section-header ~ .column,
 .about__section.has-4-columns .is-section-header ~ .column,
diff --git a/tools/storybook/wordpress/css/about.css b/tools/storybook/wordpress/css/about.css
index eff4e2940cb..25cd1eb0ecc 100644
--- a/tools/storybook/wordpress/css/about.css
+++ b/tools/storybook/wordpress/css/about.css
@@ -286,7 +286,7 @@
 	grid-column-start: 4;
 }
 
-/* Any columns following a section header need to be expicitly put into the second row, for IE support. */
+/* Any columns following a section header need to be explicitly put into the second row, for IE support. */
 .about__section.has-2-columns .is-section-header ~ .column,
 .about__section.has-3-columns .is-section-header ~ .column,
 .about__section.has-4-columns .is-section-header ~ .column,
diff --git a/tools/storybook/wordpress/css/list-tables-rtl.css b/tools/storybook/wordpress/css/list-tables-rtl.css
index 47375209462..3a0285f70e8 100644
--- a/tools/storybook/wordpress/css/list-tables-rtl.css
+++ b/tools/storybook/wordpress/css/list-tables-rtl.css
@@ -872,7 +872,7 @@ tr:hover .row-actions,
 
 tr.inline-edit-row td {
 	padding: 0;
-	/* Prevents the focus style on .inline-edit-wrapper from being cutted-off */
+	/* Prevents the focus style on .inline-edit-wrapper from being cut-off */
 	position: relative;
 }
 
diff --git a/tools/storybook/wordpress/css/list-tables.css b/tools/storybook/wordpress/css/list-tables.css
index 84e390d83eb..c95f5a283fe 100644
--- a/tools/storybook/wordpress/css/list-tables.css
+++ b/tools/storybook/wordpress/css/list-tables.css
@@ -871,7 +871,7 @@ tr:hover .row-actions,
 
 tr.inline-edit-row td {
 	padding: 0;
-	/* Prevents the focus style on .inline-edit-wrapper from being cutted-off */
+	/* Prevents the focus style on .inline-edit-wrapper from being cut-off */
 	position: relative;
 }
 
diff --git a/tools/version-bump/.eslintrc b/tools/version-bump/.eslintrc
deleted file mode 100644
index b2a08066eea..00000000000
--- a/tools/version-bump/.eslintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"extends": [ "plugin:@woocommerce/eslint-plugin/recommended" ]
-}
diff --git a/tools/version-bump/README.md b/tools/version-bump/README.md
deleted file mode 100644
index 3bb50735fd3..00000000000
--- a/tools/version-bump/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Version Bump
-
-## Description
-
-`version-bump` is a CLI tool to bump versions in plugins found in the Monorepo.
-
-## Usage
-
-Bump WooCommerce to version 7.1.0:
-
-```
-pnpm --filter version-bump run version bump woocommerce -v 7.1.0
-```
-
-**Arguments**:
-plugin - Monorepo plugin
-
-**Options**:
--v, --version <string> Version to bump to
--h, --help display help for command
-
-### Prereleases
-
-Prerelease versions such as `7.3.0-dev` and `7.5.0-beta.1` are acceptable.
-
-When updating with a `-dev` prerelease suffix, the tool will not update the stable tag but will update the readme changelog to prepare for the next release cycle.
diff --git a/tools/version-bump/commands/bump.ts b/tools/version-bump/commands/bump.ts
deleted file mode 100644
index 4792b9e6254..00000000000
--- a/tools/version-bump/commands/bump.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * External dependencies
- */
-import { prerelease } from 'semver';
-import { Logger } from '@woocommerce/monorepo-utils/src/core/logger';
-
-/**
- * Internal dependencies
- */
-import { program } from '../program';
-import { validateArgs, stripPrereleaseParameters } from '../lib/validate';
-import {
-	updatePluginFile,
-	updateReadmeChangelog,
-	updateJSON,
-	updateClassPluginFile,
-	updateReadmeStableTag,
-} from '../lib/update';
-
-program
-	.command( 'bump' )
-	.description( 'CLI to automate version bumping.' )
-	.argument( '<plugin>', 'Monorepo plugin' )
-	.requiredOption( '-v, --version <string>', 'Version to bump to' )
-	.action( async ( plugin: string, options ) => {
-		Logger.startTask( `Bumping versions to ${ options.version }` );
-
-		await validateArgs( plugin, options );
-
-		let nextVersion = options.version;
-
-		const prereleaseParameters = prerelease( nextVersion );
-		const isDevVersionBump =
-			prereleaseParameters && prereleaseParameters[ 0 ] === 'dev';
-
-		await updatePluginFile( plugin, nextVersion );
-
-		// Any updated files besides the plugin file get a version stripped of prerelease parameters.
-		nextVersion = stripPrereleaseParameters( nextVersion );
-
-		if ( isDevVersionBump ) {
-			// Bumping the dev version means updating the readme's changelog.
-			await updateReadmeChangelog( plugin, nextVersion );
-		} else {
-			// Only update stable tag on real releases.
-			await updateReadmeStableTag( plugin, nextVersion );
-		}
-
-		await updateJSON( 'composer', plugin, nextVersion );
-		await updateJSON( 'package', plugin, nextVersion );
-		await updateClassPluginFile( plugin, nextVersion );
-
-		Logger.endTask();
-	} );
diff --git a/tools/version-bump/index.ts b/tools/version-bump/index.ts
deleted file mode 100644
index d7d76db112d..00000000000
--- a/tools/version-bump/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Internal dependencies
- */
-import { program } from './program';
-import './commands/bump';
-
-// Start the program
-program.parse();
diff --git a/tools/version-bump/lib/const.ts b/tools/version-bump/lib/const.ts
deleted file mode 100644
index 7b6fbef42ad..00000000000
--- a/tools/version-bump/lib/const.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * External dependencies
- */
-import { dirname } from 'path';
-
-// Escape from ./tools/package-release/src
-export const MONOREPO_ROOT = dirname( dirname( dirname( __dirname ) ) );
diff --git a/tools/version-bump/lib/update.ts b/tools/version-bump/lib/update.ts
deleted file mode 100644
index f10555dacdd..00000000000
--- a/tools/version-bump/lib/update.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * External dependencies
- */
-import { readFile, writeFile, stat } from 'fs/promises';
-import { join } from 'path';
-import { Logger } from '@woocommerce/monorepo-utils/src/core/logger';
-
-/**
- * Internal dependencies
- */
-import { MONOREPO_ROOT } from './const';
-
-/**
- * Update plugin readme stable tag.
- *
- * @param  plugin      plugin to update
- * @param  nextVersion version to bump to
- */
-export const updateReadmeStableTag = async (
-	plugin: string,
-	nextVersion: string
-): Promise< void > => {
-	const filePath = join( MONOREPO_ROOT, `plugins/${ plugin }/readme.txt` );
-	try {
-		const readmeContents = await readFile( filePath, 'utf8' );
-
-		const updatedReadmeContents = readmeContents.replace(
-			/Stable tag: \d+\.\d+\.\d+\n/m,
-			`Stable tag: ${ nextVersion }\n`
-		);
-
-		await writeFile( filePath, updatedReadmeContents );
-	} catch ( e ) {
-		Logger.error( 'Unable to update readme stable tag' );
-	}
-};
-
-/**
- * Update plugin readme changelog.
- *
- * @param  plugin      plugin to update
- * @param  nextVersion version to bump to
- */
-export const updateReadmeChangelog = async (
-	plugin: string,
-	nextVersion: string
-): Promise< void > => {
-	const filePath = join( MONOREPO_ROOT, `plugins/${ plugin }/readme.txt` );
-	try {
-		const readmeContents = await readFile( filePath, 'utf8' );
-
-		const updatedReadmeContents = readmeContents.replace(
-			/= \d+\.\d+\.\d+ \d\d\d\d-XX-XX =\n/m,
-			`= ${ nextVersion } ${ new Date().getFullYear() }-XX-XX =\n`
-		);
-
-		await writeFile( filePath, updatedReadmeContents );
-	} catch ( e ) {
-		Logger.error( 'Unable to update readme changelog' );
-	}
-};
-
-/**
- * Update plugin class file.
- *
- * @param  plugin      plugin to update
- * @param  nextVersion version to bump to
- */
-export const updateClassPluginFile = async (
-	plugin: string,
-	nextVersion: string
-): Promise< void > => {
-	const filePath = join(
-		MONOREPO_ROOT,
-		`plugins/${ plugin }/includes/class-${ plugin }.php`
-	);
-
-	try {
-		await stat( filePath );
-	} catch ( e ) {
-		// Class file does not exist, return early.
-		return;
-	}
-
-	try {
-		const classPluginFileContents = await readFile( filePath, 'utf8' );
-
-		const updatedClassPluginFileContents = classPluginFileContents.replace(
-			/public \$version = '\d+\.\d+\.\d+';\n/m,
-			`public $version = '${ nextVersion }';\n`
-		);
-
-		await writeFile( filePath, updatedClassPluginFileContents );
-	} catch ( e ) {
-		Logger.error( 'Unable to update plugin file.' );
-	}
-};
-
-/**
- * Update plugin JSON files.
- *
- * @param {string} type        plugin to update
- * @param {string} plugin      plugin to update
- * @param {string} nextVersion version to bump to
- */
-export const updateJSON = async (
-	type: 'package' | 'composer',
-	plugin: string,
-	nextVersion: string
-): Promise< void > => {
-	const filePath = join(
-		MONOREPO_ROOT,
-		`plugins/${ plugin }/${ type }.json`
-	);
-	try {
-		const composerJson = JSON.parse( await readFile( filePath, 'utf8' ) );
-		composerJson.version = nextVersion;
-		await writeFile(
-			filePath,
-			JSON.stringify( composerJson, null, '\t' ) + '\n'
-		);
-	} catch ( e ) {
-		Logger.error( 'Unable to update composer.json' );
-	}
-};
-
-/**
- * Update plugin main file.
- *
- * @param  plugin      plugin to update
- * @param  nextVersion version to bump to
- */
-export const updatePluginFile = async (
-	plugin: string,
-	nextVersion: string
-): Promise< void > => {
-	const filePath = join(
-		MONOREPO_ROOT,
-		`plugins/${ plugin }/${ plugin }.php`
-	);
-	try {
-		const pluginFileContents = await readFile( filePath, 'utf8' );
-
-		const updatedPluginFileContents = pluginFileContents.replace(
-			/Version: \d+\.\d+\.\d+.*\n/m,
-			`Version: ${ nextVersion }\n`
-		);
-		await writeFile( filePath, updatedPluginFileContents );
-	} catch ( e ) {
-		Logger.error( 'Unable to update plugin file.' );
-	}
-};
diff --git a/tools/version-bump/lib/validate.ts b/tools/version-bump/lib/validate.ts
deleted file mode 100644
index ae6ed7353f8..00000000000
--- a/tools/version-bump/lib/validate.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * External dependencies
- */
-import { valid, lt as versionLessThan, parse } from 'semver';
-import { join } from 'path';
-import { readFile } from 'fs/promises';
-import { Logger } from '@woocommerce/monorepo-utils/src/core/logger';
-
-/**
- * Internal dependencies
- */
-import { MONOREPO_ROOT } from './const';
-
-/**
- * Get a plugin's current version.
- *
- * @param  plugin plugin to update.
- */
-export const getCurrentVersion = async (
-	plugin: string
-): Promise< string | void > => {
-	const filePath = join( MONOREPO_ROOT, `plugins/${ plugin }/composer.json` );
-	try {
-		const composerJSON = JSON.parse( await readFile( filePath, 'utf8' ) );
-		return composerJSON.version;
-	} catch ( e ) {
-		Logger.error( 'Unable to read current version.' );
-	}
-};
-
-/**
- * When given a prerelease version, return just the version.
- *
- * @param {string} prereleaseVersion version with prerelease params
- * @return {string} version
- */
-export const stripPrereleaseParameters = (
-	prereleaseVersion: string
-): string => {
-	const parsedVersion = parse( prereleaseVersion );
-	if ( parsedVersion ) {
-		const { major, minor, patch } = parsedVersion;
-		return `${ major }.${ minor }.${ patch }`;
-	}
-	return prereleaseVersion;
-};
-
-/**
- * Validate inputs.
- *
- * @param  plugin          plugin
- * @param  options         options
- * @param  options.version version
- */
-export const validateArgs = async (
-	plugin: string,
-	options: { version: string }
-): Promise< void > => {
-	const nextVersion = options.version;
-
-	if ( ! valid( nextVersion ) ) {
-		Logger.error(
-			'Invalid version supplied, please pass in a semantically correct version.'
-		);
-	}
-
-	const currentVersion = await getCurrentVersion( plugin );
-
-	if ( ! currentVersion ) {
-		Logger.error( 'Unable to determine current version' );
-	} else if ( versionLessThan( nextVersion, currentVersion ) ) {
-		Logger.error(
-			'The version supplied is less than the current version, please supply a valid version.'
-		);
-	}
-};
diff --git a/tools/version-bump/package.json b/tools/version-bump/package.json
deleted file mode 100644
index da9789252a2..00000000000
--- a/tools/version-bump/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"name": "version-bump",
-	"version": "0.1.0",
-	"description": "Automate version bumping for WooCommerce plugins",
-	"main": " ",
-	"author": "",
-	"license": "GPL-2.0-or-later",
-	"engines": {
-		"node": "^16.14.1",
-		"pnpm": "^8.3.1"
-	},
-	"devDependencies": {
-		"@tsconfig/node16": "^1.0.3",
-		"@types/express": "^4.17.13",
-		"typescript": "^4.9.5"
-	},
-	"dependencies": {
-		"@commander-js/extra-typings": "^0.1.0",
-		"@woocommerce/monorepo-utils": "workspace:*",
-		"chalk": "^4.1.2",
-		"commander": "9.4.0",
-		"express": "^4.18.1",
-		"ora": "^5.4.1",
-		"semver": "^7.3.2",
-		"ts-node": "^10.9.1"
-	},
-	"scripts": {
-		"lint": "eslint . --ext .ts --config .eslintrc",
-		"version": "node -r ts-node/register ./index.ts"
-	}
-}
diff --git a/tools/version-bump/program.ts b/tools/version-bump/program.ts
deleted file mode 100644
index f593816b288..00000000000
--- a/tools/version-bump/program.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * External dependencies
- */
-import { Command } from '@commander-js/extra-typings';
-
-export const program = new Command();
-
-program
-	.name( 'version-bump' )
-	.description( 'CLI to automate version bumping for WooCommerce plugins.' );
diff --git a/tools/version-bump/tsconfig.json b/tools/version-bump/tsconfig.json
deleted file mode 100644
index ec4177ddeb8..00000000000
--- a/tools/version-bump/tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"extends": "@tsconfig/node16/tsconfig.json",
-	"ts-node": {
-		"transpileOnly": true,
-		"files": true
-	}
-}